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

base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java

@@ -124,17 +124,21 @@ public class DemoWebApiController {
         //更新窗口事项中的部门id
         List<WindowMatterEntity> windowMatterEntities = windowMatterService.find(new WindowMatterQuery());
         for (WindowMatterEntity windowMatterEntity : windowMatterEntities) {
-            DeptEntity extCache = deptService.getExtCache(windowMatterEntity.getDeptCode());
-            if (!ObjectUtils.isEmpty(extCache)) {
-                if (extCache.getId() != windowMatterEntity.getDeptId()) {
-                    windowMatterEntity.setDeptId(extCache.getId());
-                    windowMatterService.update(windowMatterEntity);
+            if(!ObjectUtils.isEmpty(windowMatterEntity.getDeptCode())){
+                DeptEntity extCache = deptService.getExtCache(windowMatterEntity.getDeptCode());
+                if (!ObjectUtils.isEmpty(extCache)) {
+                    if (extCache.getId() != windowMatterEntity.getDeptId()) {
+                        windowMatterEntity.setDeptId(extCache.getId());
+                        windowMatterService.update(windowMatterEntity);
+                    }
                 }
             }
+
         }
 
         List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(new SiteMatterQuery());
         for (SiteMatterEntity siteMatterEntity : siteMatterEntities) {
+            if(ObjectUtils.isEmpty(siteMatterEntity.getDeptCode())) continue;
             DeptEntity extCache = deptService.getExtCache(siteMatterEntity.getDeptCode());
             if (!ObjectUtils.isEmpty(extCache)) {
                 if (extCache.getId() != siteMatterEntity.getDeptId()) {

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

@@ -71,6 +71,14 @@ Content-Type: application/json
 }
 
 
+###testre
+POST {{baseUrl}}/test/reDepts
+Content-Type: application/json
+
+{}
+
+
+
 ###短信设置编辑
 GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
 Accept: application/json