Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -19,7 +19,7 @@
 		</plugin>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
 			<property name="enableExecutorTime" value="true" />
-			<property name="showSql" value="false" />
+			<property name="showSql" value="true" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/dept/DeptMapper.xml

@@ -1092,14 +1092,31 @@
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
+
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
                     ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -1213,12 +1230,7 @@
                 </if>
             </trim>
         </if>
-        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
-            ,field(a.id,
-            <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
+
 
     </sql>
     <sql id="_group_by_">

base-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http

@@ -10,7 +10,8 @@ Content-Type: application/json
 POST {{baseUrl}}/dept/list
 Content-Type: application/json
 
-{"siteId":1,"page":"1","size":"3","idList":[9,8,5,3]}
+#{"siteId":1,"page":"1","size":"3","idList":[422,420,413,412],"orderColList":[{"colName":"sort","sortKind":"asc"}]}
+{"siteId":1,"page":"1","size":"3","idList":[9,5,3,2],"orderColList":[{"colName":"sort","sortKind":"asc"}]}
 ###部门更新与保存
 POST {{baseUrl}}/dept/save
 Content-Type: application/json