fix -SAAS系统，编辑用户，当用户密码为空时，设置密码提示密码不正确

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

@@ -81,7 +81,7 @@ public class HospitalSaasUserReq {
         if (null == this.sourceType) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "资源类型不能为空！");
         }
-        if (!Pattern.matches("^[A-Za-z0-9]{5,10}$", this.password)) {
+        if (!Pattern.matches("^[A-Za-z0-9]{6,10}$", this.password)) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "密码需由6-10位字母或数字组成！");
         }
         if (Objects.nonNull(this.comment) && this.comment.length() > 100) {

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

@@ -137,8 +137,16 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             }
             accountService.updateAccountById(account);
             /** 修改密码 */
+            Integer acctId = byMobilePhone.getAcctId();
+            if (null == acctId){
+                throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "数据有误");
+            }
             if (StringUtils.isNotEmpty(req.getPassword()) && StringUtils.isEmpty(byMobilePhone.getPassword())) {
-                passwordService.modifyPassword(mobileEncrypt, byMobilePhone.getPassword(), StringUtils.upperCase(MD5Util.MD5(req.getPassword())), true);
+                AccountInfoEntity accountInfo = accountInfoDetailMapper.selectByPrimaryKey(acctId);
+                if (accountInfo == null){
+                    throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前用户不存在");
+                }
+                passwordService.modifyPassword(mobileEncrypt, accountInfo.getPassword(), StringUtils.upperCase(MD5Util.MD5(req.getPassword())), true);
             }
         }
         return 1;
@@ -252,11 +260,15 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         /** 修改密码 */
         if (StringUtils.isNotEmpty(req.getPassword())) {
             Account accountExist = accountMapper.selectById(req.getId());
-            if (accountExist == null) {
+            if (accountExist == null || accountExist.getAcctId() == null) {
                 throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前用户不存在");
             }
-            if (StringUtils.isEmpty(accountExist.getPassword())) {
-                passwordService.modifyPassword(accountExist.getMobilePhone(), accountExist.getPassword(), StringUtils.upperCase(MD5Util.MD5(req.getPassword())), true);
+            if (null == accountExist.getAcctId()){
+                throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "数据有误");
+            }
+            AccountInfoEntity accountInfo = accountInfoDetailMapper.selectByPrimaryKey(accountExist.getAcctId());
+            if (accountInfo!= null && StringUtils.isEmpty(accountInfo.getPassword())) {
+                passwordService.modifyPassword(accountExist.getMobilePhone(), accountInfo.getPassword(), StringUtils.upperCase(MD5Util.MD5(req.getPassword())), true);
             }
         }