bugfix - 问卷、问卷模板排序问题

rc-buisness/src/main/resources/mapper/rc/TQuestionnaireMapper.xml

@@ -32,11 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         good_practices, standard, completion_status, q.person_in_charge, q.reviewer, q.remarks, q.dept_id,q.open_item_status,
         SUBSTR(q.directory, 1, INSTR(q.directory, '.') - 1) as codeSubStr,
         u1.nick_name as person_in_charge_name, u2.nick_name as reviewer_name
---         o.status as openitem_status
         from t_questionnaire q
         left join sys_user u1 on q.person_in_charge = u1.user_id
         left join sys_user u2 on q.reviewer = u2.user_id
---         left join t_open_item o on o.questionnaire_id = q.id
     </sql>
 
     <select id="selectTQuestionnaireListByDirectory" parameterType="TQuestionnaire" resultMap="TQuestionnaireResult">
@@ -59,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
         </where>
-        order by (SUBSTR(q.directory, 1, INSTR(q.directory, '.') - 1) + 0) asc
+        order by (SUBSTR(q.directory, 1, INSTR(q.directory, '.') - 1) + 0) asc, q.directory asc, q.code asc
     </select>
 
     <select id="selectTQuestionnaireList" parameterType="TQuestionnaire" resultMap="TQuestionnaireResult">
@@ -82,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
         </where>
-        order by (SUBSTR(q.directory, 1, INSTR(q.directory, '.') - 1) + 0) asc
+        order by (SUBSTR(q.directory, 1, INSTR(q.directory, '.') - 1) + 0) asc, q.directory asc, q.code asc
     </select>
     
     <select id="selectTQuestionnaireById" parameterType="Long" resultMap="TQuestionnaireResult">

rc-buisness/src/main/resources/mapper/rc/TQuestionnaireTemplateMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and qt.name like concat('%', #{name}, '%')</if>
             <if test="deptId != null  and deptId != ''"> and qt.dept_id = #{deptId}</if>
         </where>
-        order by (SUBSTR(qt.directory, 1, INSTR(qt.directory, '.') - 1) + 0) asc, qt.code asc
+        order by (SUBSTR(qt.directory, 1, INSTR(qt.directory, '.') - 1) + 0) asc, qt.directory asc, qt.code asc
     </select>
     
     <select id="selectTQuestionnaireTemplateById" parameterType="Long" resultMap="TQuestionnaireTemplateResult">