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

base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -55,15 +55,19 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
     @Override
     protected void doListBefore(DeptEntity query, Map<String, Object> model, Context context) throws AppException {
 
-        if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(new ArrayList<OrderCol>() {
-                {
-                    add(new OrderCol("a.sort", OrderCol.ASCENDING));
-                    add(new OrderCol("a.createTime", OrderCol.DESCENDING));
-                }
-            });
-        } else {
-            query.getOrderColList().add(new OrderCol("a.createTime", OrderCol.DESCENDING));
+        if(ObjectUtils.isEmpty(query.getIdList())){
+            if (ObjectUtils.isEmpty(query.getOrderColList())) {
+                query.setOrderColList(new ArrayList<OrderCol>() {
+                    {
+                        add(new OrderCol("a.sort", OrderCol.ASCENDING));
+                        add(new OrderCol("a.createTime", OrderCol.DESCENDING));
+                    }
+                });
+            } else {
+                query.getOrderColList().add(new OrderCol("a.createTime", OrderCol.DESCENDING));
+            }
+        }else{
+
         }
         if (!ObjectUtils.isEmpty(query.getFilter()) && YesNoEnum.YES.getValue() == query.getFilter()) {
             //过滤部门事项数据为0的部门

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

@@ -1213,6 +1213,13 @@
                 </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_">
         <if test="groupList != null and !groupList.isEmpty()">

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

@@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName
 Content-Type: application/json
 
 {
-  "areaCode": "511500000000"
+  "areaCode": "510900000000"
 }
 
 

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

@@ -6,6 +6,11 @@ Content-Type: application/json
 {"siteId":1,"page":"1","size":"-1","orderColList":[{"colName":"sort","sortKind":"asc"}]}
 
 
+###部门列表1
+POST {{baseUrl}}/dept/list
+Content-Type: application/json
+
+{"siteId":1,"page":"1","size":"3","idList":[9,8,5,3]}
 ###部门更新与保存
 POST {{baseUrl}}/dept/save
 Content-Type: application/json