Merge branch 'dev-20220317' into 'release'

Dev 20220317

See merge request !95

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/resp/HospitalSaasUserEditResp.java

@@ -28,4 +28,6 @@ public class HospitalSaasUserEditResp {
     private Integer pwdFlag = 1;
     @ApiModelProperty("角色ids")
     private List<Long> roleIds;
+
+    private Integer  acctId;
 }

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

@@ -140,8 +140,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;
@@ -255,11 +263,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);
             }
         }
 
@@ -328,15 +340,19 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             return new HospitalSaasUserEditResp();
         }
         resp.setPwdFlag(2);
+        if (resp.getAcctId() != null){
+            AccountInfoEntity accountInfo = accountInfoDetailMapper.selectByPrimaryKey(resp.getAcctId());
+            if (StringUtils.isNotBlank(accountInfo.getPassword())) {
+                resp.setPwdFlag(1);
+                resp.setPassword(accountInfo.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;
         }
-        if (StringUtils.isNotBlank(resp.getPassword())) {
-            resp.setPwdFlag(1);
-        }
         return resp;
     }
 

server/src/main/resources/mybatis/AccountMapper.xml

@@ -40,7 +40,7 @@
     <sql id="Base_Column_List">
         id, sex, name, mobile_phone, status, certify_status, nation, avatar_image_url, email, qrcode, nickname, personal_sign, delete_flag,
     creat_id, creat_time, modify_id, modify_time, password, info, entire_flag, reg_time, last_login_time,
-    unionid, register_source, comment, register_type, first_login_time, card, birthday, hospital_id, hospital
+    unionid, register_source, comment, register_type, first_login_time, card, birthday, hospital_id, hospital,acct_id
     </sql>
 
     <select id="selectById" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -394,7 +394,7 @@
                p.hospital_id  as hospitalId,
                p.mobile_phone as mobile,
                p.comment      as comment,
-               p.password     as password
+               p.acct_id      as  acctId
         from p_doctor as p
         where p.id = #{id, jdbcType=INTEGER}
           and p.delete_flag = 1