Merge branch 'release' into dev-crm-0307

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

@@ -254,13 +254,12 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
 
         /** 修改密码 */
         if (StringUtils.isNotEmpty(req.getPassword())) {
-            String mobileEncrypt = AESUtil.encryptV0(req.getMobile());
-            Account accountExist = accountMapper.getByMobilePhone(mobileEncrypt);
+            Account accountExist = accountMapper.selectById(req.getId());
             if (accountExist == null) {
                 throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前用户不存在");
             }
             if (StringUtils.isEmpty(accountExist.getPassword())) {
-                passwordService.modifyPassword(mobileEncrypt, accountExist.getPassword(), StringUtils.upperCase(MD5Util.MD5(req.getPassword())), true);
+                passwordService.modifyPassword(accountExist.getMobilePhone(), accountExist.getPassword(), StringUtils.upperCase(MD5Util.MD5(req.getPassword())), true);
             }
         }