Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

zhongrj

2023-07-26 f169b2152fb4a63136f841f9d0d65b0bdd4686d8

 skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java

@@ -151,8 +151,12 @@
         }

         //拼接用户所属行政区划、责任人需要返回水库ids
         userInfo.getDetail().set("resIds","");
         if (StringUtil.isNotBlank(user.getPhone())) {
         R<AttResManagePerson> attRes = attResManagePersonClient.queryListByPhone(user.getPhone());
         userInfo.getDetail().set("resIds",attRes.getData());
         }


         String deptStr = "";
         if (userInfo.getUser().getDeptId().indexOf(",") > 0){