修改根据业务查询部门逻辑

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -101,6 +101,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             if (!ObjectUtils.isEmpty(entity.getSiteId())) {
                 SiteEntity siteEntity = siteService.get(entity.getSiteId(), context);
                 entity.setAreaCode(siteEntity.getAreaCode());
+                DeptEntity extCache = deptService.getExtCache(entity.getDeptCode());
+                entity.setDeptName(extCache==null?"":extCache.getName());
             }
 
         }
@@ -136,7 +138,14 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
     @Override
     protected void updateBefore(MatterEntity entity, Context context) throws AppException {
-
+        if (SourceEnum.自定义.getValue().equals(entity.getSource())) {
+            if (!ObjectUtils.isEmpty(entity.getSiteId())) {
+                SiteEntity siteEntity = siteService.get(entity.getSiteId(), context);
+                entity.setAreaCode(siteEntity.getAreaCode());
+                DeptEntity extCache = deptService.getExtCache(entity.getDeptCode());
+                entity.setDeptName(extCache==null?"":extCache.getName());
+            }
+        }
         super.updateBefore(entity, context);
     }
 

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -336,7 +336,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
         Rest<String> rest = userFeign.synchSiteAuth();
         if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
-
             UserPdu userPdu = new UserPdu();
             userPdu.setPage(1);
             userPdu.setSize(-1);
@@ -350,20 +349,32 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     @Override
     public List<SiteTreeSelect> getSiteTree(Context context) {
         List<SiteTreeSelect> siteTreeSelects = siteTreeMap.get(context.getUser().getId());
-        String siteTreeSelectStr = cacheService.hget(USER_SITE_TREE, context.getUser().getId().toString(), String.class);
+        List<SiteTreeSelect> collect = getSiteTreeSelects(context.getUser().getId().toString());
+        log.info("siteTree:{}", JSON.toJSONString(collect));
+        if (!ObjectUtils.isEmpty(collect)) {
+            return collect;
+        } else {
+            //反全站点树
+            return getSiteTreeSelects("0");
+        }
+
+        //如果所属站点为空返回全节点树
+//        if (!ObjectUtils.isEmpty(siteTreeSelects)) {
+//            return siteTreeSelects;
+//        } else {
+//            return siteTreeMap.get(1);
+//        }
+    }
+
+    private List<SiteTreeSelect> getSiteTreeSelects(String userId) {
+        String siteTreeSelectStr = cacheService.hget(USER_SITE_TREE, userId, String.class);
         //反序列化树对象
         JSONArray jsonArray = JSON.parseArray(siteTreeSelectStr);
         List<SiteTreeSelect> collect = jsonArray.stream().map(item -> {
             SiteTreeSelect siteTreeSelect = JSON.parseObject(item.toString(), SiteTreeSelect.class);
             return siteTreeSelect;
         }).collect(Collectors.toList());
-        log.info("siteTree:{}",JSON.toJSONString(collect));
-        //如果所属站点为空返回全节点树
-        if (!ObjectUtils.isEmpty(siteTreeSelects)) {
-            return siteTreeSelects;
-        } else {
-            return siteTreeMap.get(1);
-        }
+        return collect;
     }
 
     @Override