fix --编辑时调整密码编辑标识

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

@@ -39,7 +39,7 @@ public class HospitalSaasUserReq {
     @ApiModelProperty("备注")
     private String comment;
 
-    @ApiModelProperty("角色id")
+    @ApiModelProperty("角色id  0 无角色 1 主管理员 2 管理员 3 saas系统管理员 4 开单医生")
     private Long roleId;
 
     @ApiModelProperty("产品类型")

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalSaasUserEditResp.java

@@ -26,5 +26,5 @@ public class HospitalSaasUserEditResp {
     @ApiModelProperty("密码")
     private String password;
     @ApiModelProperty("密码是否可修改  1 不可修改  2 可修改")
-    private Integer pwdFlag;
+    private Integer pwdFlag = 1;
 }

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

@@ -118,6 +118,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
                 accountMapper.insertSelective(account);
 
                 insertAppRole(account.getId());
+
                 insertSaasRole(req, account.getId(), account.getId());
 
                 redisClient.del(nxKey);
@@ -146,6 +147,9 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
     }
 
     private void insertSaasRole(HospitalSaasUserReq req, Long doctorId, Long userId) {
+        if (Objects.equals(req.getRoleId(), 0)) {
+            return;
+        }
         PermissionDoctorRole doctorRole = new PermissionDoctorRole();
         doctorRole.setDoctorId(doctorId);
         doctorRole.setHospitalId(req.getHospitalId().longValue());
@@ -179,7 +183,7 @@ 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(),3)){
+            if (Objects.equals(t.getRoleId(), 3)) {
                 t.setAdminSaasFlag(1);
             }
         });
@@ -292,6 +296,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         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);
         return resp;