增加人员角色删除控制范围

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

@@ -48,6 +48,9 @@ public class HospitalSaasUserReq {
     @ApiModelProperty("资源类型 1表示安卓，2表示ios，3表示web，4表示H5登录，5表示admin后台 6.SAAS")
     private Integer sourceType;
 
+    @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

@@ -191,12 +191,19 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         if (Objects.isNull(req) || Objects.isNull(req.getHospitalId())) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "参数错误");
         }
+        if (req.getLoginFlag() == 1 && Objects.nonNull(req.getRoleId()) && req.getRoleId() != 0 && req.getRoleId() < SaasRoleEnum.SAAS_MAIN_ADMIN.getCode()) {
+            throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前角色不可删除");
+        }
+        if (req.getLoginFlag() == 0 && Objects.nonNull(req.getRoleId()) && req.getRoleId() != 0 && req.getRoleId() < SaasRoleEnum.SAAS_DOCTOR.getCode()) {
+            throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前角色不可删除");
+        }
         validatorAdminRole(req.getRoleId(), req.getHospitalId().longValue());
         String mobileEncrypt = AESUtil.encryptV0(req.getMobile());
         Account accountExist = accountMapper.getByMobilePhone(mobileEncrypt);
         if (accountExist == null) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前用户不存在");
         }
+
         Account account = new Account();
         account.setId(req.getId());
         account.setModifyId(doctorId);
@@ -279,7 +286,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             return new HospitalSaasUserEditResp();
         }
         //手机号 不为空 解密脱敏
-        if (StringUtils.isNotBlank(resp.getMobile())) {
+        if (StringUtils.isNotBlank(resp.getMobile()) && StringUtils.isNotBlank(resp.getPassword())) {
             String phone = EncryptUtils.decryptContent(resp.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY);
             resp.setMobile(phone);
             return resp;