Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-05-13 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38

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

@@ -170,11 +170,19 @@
         userInfo.getDetail().set("phone",Base64Utils.getBase64Encode(user.getPhone()));

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

         String deptIds = userInfo.getUser().getDeptId();
         if (deptIds.indexOf(",") > 0){
            deptStr = deptIds.split(",")[0];
         }else {
            deptStr = userInfo.getUser().getDeptId();
            deptStr = deptIds;
         }

         String resDeptIds = "";

         resDeptIds = sysClient.getResDept(deptIds);
         userInfo.getDetail().set("resDeptIds",resDeptIds);

         R<Dept> deptRes = sysClient.getDept(Long.valueOf(deptStr));
         if (StringUtil.isBlank(deptRes.getData().getAdCode())) {
            // 部门为空
@@ -182,16 +190,22 @@
            userInfo.getDetail().set("adCodeBase", "");
            userInfo.getDetail().set("parentDept",0);
         } else {
            userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
            //根据用户标识类型判断是水库还是堤防
            if (user.getType().equals("堤防")){
               //堤防需要从自己的库中获取行政区划
               userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getYwxtAdBaseById(deptRes.getData().getAdCode()).getData());
            }else{
               //水库从中台表中获取行政区划
               userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
            }
            userInfo.getDetail().set("parentDept",deptRes.getData().getParentId());
         }

         String collectResIds = collectClient.getMyCollect(user.getId().toString());
         userInfo.getDetail().set("collect",collectResIds);

         User loginUserInfo = userInfo.getUser();

         //获取解密后的Base64字符串
//         获取解密后的Base64字符串
         R<ResultDTO> encryptRes = pwdClient.getDecrypt(loginUserInfo.getSm4iv(), loginUserInfo.getKeyindexs(),loginUserInfo.getEncdata());

         if (encryptRes.getCode() != 200){