部门列表接口优化，只显示有单事项的部门

single-matter/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -8,12 +8,13 @@ import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.dept.DeptPdu;
 import com.mortals.xhx.common.pdu.matter.MatterPdu;
 import com.mortals.xhx.feign.dept.IDeptFeign;
+import com.mortals.xhx.module.single.model.SingleMatterEntity;
+import com.mortals.xhx.module.single.service.SingleMatterService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 部门
@@ -27,6 +28,8 @@ public class DeptController extends BaseJsonBodyController {
 
     @Autowired
     private IDeptFeign deptFeign;
+    @Autowired
+    private SingleMatterService singleMatterService;
 
     @PostMapping({"list"})
     @UnAuth
@@ -38,11 +41,28 @@ public class DeptController extends BaseJsonBodyController {
 
         int code;
         try {
+            query.setSize(-1);
             Rest<RespData<List<DeptPdu>>> result = deptFeign.list(query);
             code = result.getCode();
             if(code > 0) {
-                model.put("data", result.getData().getData());
-                model.put("pageInfo", result.getData().getPageInfo());
+                List<SingleMatterEntity> deptList = singleMatterService.getSingleMatterDeptList();
+                if(CollectionUtils.isNotEmpty(deptList)){
+                    Set<String> deptCode = new HashSet<String>();
+                    deptList.forEach(i->{
+                        deptCode.add(i.getDeptCode());
+                    });
+                    List<DeptPdu> list = new ArrayList<>();
+                    for(DeptPdu deptPdu:result.getData().getData()){
+                        if(deptCode.contains(deptPdu.getDeptNumber())){
+                            list.add(deptPdu);
+                        }
+                    }
+                    model.put("data", list);
+                }else {
+                    model.put("data", result.getData().getData());
+                }
+
+                //model.put("pageInfo", result.getData().getPageInfo());
                 model.put("dict", result.getData().getDict());
                 model.put("message_info", busiDesc + "成功");
             }else {

single-matter/src/main/java/com/mortals/xhx/module/single/dao/SingleMatterDao.java

@@ -13,5 +13,5 @@ import java.util.List;
 
 public interface  SingleMatterDao extends ICRUDDao<SingleMatterEntity,Long>{
 
-
+    List<SingleMatterEntity> getSingleMatterDeptList();
 }

single-matter/src/main/java/com/mortals/xhx/module/single/dao/ibatis/SingleMatterDaoImpl.java

@@ -17,5 +17,8 @@ import java.util.List;
 public class SingleMatterDaoImpl extends BaseCRUDDaoMybatis<SingleMatterEntity,Long> implements SingleMatterDao {
 
 
-
+    @Override
+    public List<SingleMatterEntity> getSingleMatterDeptList() {
+        return this.getSqlSession().selectList("getSingleMatterDeptList");
+    }
 }

single-matter/src/main/java/com/mortals/xhx/module/single/service/SingleMatterService.java

 package com.mortals.xhx.module.single.service;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.single.model.SingleMatterEntity;
+
+import java.util.List;
+
 /**
 * SingleMatterService
 *
@@ -15,4 +18,6 @@ public interface SingleMatterService extends ICRUDService<SingleMatterEntity,Lon
      * @param id
      */
     void addViewsCount(Long id);
+
+    List<SingleMatterEntity> getSingleMatterDeptList();
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/single/service/impl/SingleMatterServiceImpl.java

@@ -117,4 +117,9 @@ public class SingleMatterServiceImpl extends AbstractCRUDServiceImpl<SingleMatte
         }
         return entity;
     }
+
+    @Override
+    public List<SingleMatterEntity> getSingleMatterDeptList(){
+        return dao.getSingleMatterDeptList();
+    }
 }
\ No newline at end of file

single-matter/src/main/resources/sqlmap/module/single/SingleMatterMapperExt.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.single.dao.ibatis.SingleMatterDaoImpl">
+    <!-- 获取 -->
+    <select id="getSingleMatterDeptList"  resultMap="SingleMatterEntity-Map">
+        select DISTINCT deptCode,deptName
+        from mortals_sys_single_matter
+    </select>
+</mapper>
\ No newline at end of file