Merge branch 'mazq-bugfix-231031' into 'master'

Mazq bugfix 231031

See merge request dcuc-tjdsj/auth-service!250

dcuc-auth-api/src/main/java/com/dragoninfo/dcuc/auth/sub/facade/IAuthOrgInfoFacade.java

@@ -169,4 +169,10 @@ public interface IAuthOrgInfoFacade {
                                          @RequestParam("unitClass") String unitClass,
                                          @RequestParam("roleLevel") String roleLevel);
 
+    /**
+     * 重构内存树
+     * @return
+     */
+    @GetMapping("reInitTrees")
+    ResponseStatus reInitTrees();
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/business/IAuthOrgBusiness.java

@@ -146,4 +146,11 @@ public interface IAuthOrgBusiness {
      * @return
      */
     List<OrgTreeNodeDTO> getCalQuotaTree(String userId, String orgId, String unitClass, String roleLevel);
+
+    /**
+     * 机构树重新构建
+     * @return
+     */
+    ResponseStatus reInitTrees();
+
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/business/impl/AuthOrgBusinessImpl.java

@@ -306,6 +306,12 @@ public class AuthOrgBusinessImpl implements IAuthOrgBusiness {
         return resultTreeNodes;
     }
 
+    @Override
+    public ResponseStatus reInitTrees() {
+        authOrgTreeService.reInitTrees(false);
+        return ResponseStatus.success();
+    }
+
     @Override
     public List<AuthOrgDTO> getByOrgCodes(List<String> orgCodes) {
         List<AuthOrgInfo> orgInfos = authOrgInfoService.getOrgByCodes(orgCodes);

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/facade/AuthOrgInfoFacade.java

@@ -104,4 +104,9 @@ public class AuthOrgInfoFacade implements IAuthOrgInfoFacade {
         return authOrgBusiness.getCalQuotaTree(userId, orgId, unitClass, roleLevel);
     }
 
+    @Override
+    public ResponseStatus reInitTrees() {
+        return authOrgBusiness.reInitTrees();
+    }
+
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AuthUserOrgRelRepository.java

@@ -34,7 +34,7 @@ public interface AuthUserOrgRelRepository extends BaseRepository<AuthUserOrgRel,
      */
     @Modifying
     @NativeQuery("update t_auth_user_org_rel r inner join t_auth_org_info o on r.org_code = o.code " +
-            "set r.org_id = o.id where r.deleted = '0' and o.deleted = '0' and r.org_code is not null and r.org_id is null")
+            "set r.org_id = o.id where o.deleted = '0' and r.org_code is not null and r.org_id is null")
     void updateOrgInfoInUser();
 
     /**

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AuthOrgTreeServiceImpl.java

@@ -504,6 +504,7 @@ public class AuthOrgTreeServiceImpl implements IAuthOrgTreeService {
                             .stream()
                             .filter(Objects::nonNull)
                             .map(treeNodeMap::get)
+                            .filter(Objects::nonNull)
                             .collect(Collectors.toList());
                     if (CollectionUtils.isNotEmpty(childNodes)) {
                         childIds.addAll(childNodes.stream()