redis部门数据

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDeptServiceImpl.java

@@ -375,8 +375,8 @@ public class SysDeptServiceImpl implements ISysDeptService {
         if (allDepts != null && allDepts.size()>0){
             log.info("我从缓存中拿到部门集合");
         }else {
-             allDepts = selectDepts(new SysDept());
-            //redisService.setCacheList(CacheConstants.DEPT_LIST,allDepts);
+            allDepts = selectDepts(new SysDept());
+            redisService.setCacheList(CacheConstants.DEPT_LIST,allDepts);
             log.info("我从数据库拿到部门集合");
         }
         SysDept sysDept = ObjectUtils.filterOne(allDepts, dept -> deptId.equals(dept.getId()));

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -211,9 +211,14 @@ public class CzrkServiceImpl implements ICzrkService {
         List<Czrk> czrks = new ArrayList<>();
         if(czrk.getQueryType().equals(Czrk.HJ)){
             czrks = czrkMapper.listByXz(czrk);
-            // 居住地址
-            List<CzrkJzdz> czrkJzdzList = getCzrkJzdzs(czrks);
-            handleList(czrks, Czrk.HJ, czrkJzdzList);
+            if(isNotEmpty(czrks)){
+                // 居住地址
+                List<CzrkJzdz> czrkJzdzList = getCzrkJzdzs(czrks);
+                handleList(czrks, Czrk.HJ, czrkJzdzList);
+            }else{
+                czrks = new ArrayList<>();
+            }
+
         }else{
             String regionId = "340882000000";
             String status = "Y";
@@ -247,10 +252,15 @@ public class CzrkServiceImpl implements ICzrkService {
         List<Czrk> czrks = new ArrayList<>();
         if(czrk.getQueryType().equals(Czrk.HJ)){
             czrks = czrkMapper.listByJs(czrk);
-            // 居住地址
-            List<CzrkJzdz> czrkJzdzList = getCzrkJzdzs(czrks);
+            if(isNotEmpty(czrks)){
+                // 居住地址
+                List<CzrkJzdz> czrkJzdzList = getCzrkJzdzs(czrks);
+
+                handleList(czrks, Czrk.HJ, czrkJzdzList);
+            }else{
+                czrks = new ArrayList<>();
+            }
 
-            handleList(czrks, Czrk.HJ, czrkJzdzList);
         }else {
             String regionId = "340882000000";
             String status = "N";