手机号加密权限处理

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserListReq.java

@@ -30,4 +30,7 @@ public class HospitalSaasUserListReq {
 
     @ApiModelProperty("页码")
     private Integer pageNo = 1;
+
+    @ApiModelProperty("登录来源  0:saas 1:运营平台")
+    private Integer loginFlag = 0;
 }

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserReq.java

@@ -50,7 +50,6 @@ public class HospitalSaasUserReq {
 
     @ApiModelProperty("登录来源  0:saas 1:运营平台")
     private Integer loginFlag = 0;
-
     public void checkInsertParams() {
         if (StringUtils.isBlank(this.mobile)) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "手机号不能为空");

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java

@@ -94,17 +94,14 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             if (accountInfoEntity == null) {
                 Date currentTime = Calendar.getInstance().getTime();
                 String md5Pwd = StringUtils.upperCase(MD5Util.MD5(req.getPassword()));
-
                 // account_info
                 AccountInfoEntity accountInfo = buildAccountInfo(mobileEncrypt, currentTime, req.getProductType(), req.getSourceType(), md5Pwd);
                 accountInfoDetailMapper.insertSelective(accountInfo);
                 Integer acctId = accountInfo.getId();
                 accountInfoDetailMapper.updateCreateInfo(acctId);
-
                 // doctor
                 Account account = buildDoctorMsg(req, mobileEncrypt, currentTime, req.getSourceType(), md5Pwd, acctId);
                 accountMapper.insertSelective(account);
-
                 insertAppRole(account.getId());
                 insertSaasRole(req, account.getId(), account.getId());
                 redisClient.del(nxKey);
@@ -171,7 +168,10 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             String phone = EncryptUtils.decryptContent(t.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY);
             String mixMobile = mixMobile(phone);
             t.setMobile(mixMobile);
-            if (Objects.equals(t.getRoleId(), SaasRoleEnum.SAAS_MAIN_ADMIN.getCode())) {
+            if (req.getLoginFlag() == 0 && Objects.nonNull(t.getRoleId()) && t.getRoleId() < SaasRoleEnum.SAAS_DOCTOR.getCode()) {
+                t.setAdminSaasFlag(1);
+            }
+            if (req.getLoginFlag() == 1 && Objects.nonNull(t.getRoleId()) && t.getRoleId() < SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) {
                 t.setAdminSaasFlag(1);
             }
         });
@@ -285,13 +285,18 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         if (null == resp) {
             return new HospitalSaasUserEditResp();
         }
+
+
         //手机号 不为空 解密脱敏
-        if (StringUtils.isNotBlank(resp.getMobile()) && StringUtils.isNotBlank(resp.getPassword())) {
+        if (StringUtils.isNotBlank(resp.getMobile())) {
             String phone = EncryptUtils.decryptContent(resp.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY);
             resp.setMobile(phone);
             return resp;
         }
         resp.setPwdFlag(2);
+        if (StringUtils.isNotBlank(resp.getPassword())) {
+            resp.setPwdFlag(1);
+        }
         return resp;
     }