fix: 设置用户密码

server/src/main/java/com/pica/cloud/account/account/server/controller/PasswordController.java

@@ -61,7 +61,7 @@ public class PasswordController extends AccountBaseController {
             String password = request.getPassword();
             if (!StringUtils.isEmpty(password) && !StringUtils.isEmpty(oldPwd)) {
                 if (!password.equals(oldPwd)) {
-                    passwordService.modifyPassword(mobile, oldPwd, password);
+                    passwordService.modifyPassword(mobile, oldPwd, password, false);
                     return PicaResponse.toResponse();
                 } else {
                     throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_EQUAL);

server/src/main/java/com/pica/cloud/account/account/server/service/PasswordService.java

@@ -13,7 +13,7 @@ public interface PasswordService {
      * @param oldPwd 旧密码
      * @param pwd    新密码
      */
-    void modifyPassword(String mobile, String oldPwd, String pwd);
+    void modifyPassword(String mobile, String oldPwd, String pwd, Boolean isForced);
 
     /**
      * 忘记密码

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

@@ -223,7 +223,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
 
         /** 修改密码 */
         if (StringUtils.isNotEmpty(req.getPassword()) && StringUtils.isEmpty(accountExist.getPassword())) {
-            passwordService.modifyPassword(mobileEncrypt, accountExist.getPassword(), req.getPassword());
+            passwordService.modifyPassword(mobileEncrypt, accountExist.getPassword(), req.getPassword(), true);
         }
 
         Map  map =new HashMap(3);

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

@@ -59,11 +59,11 @@ public class PasswordServiceImpl implements PasswordService {
 
     @Override
     @Transactional
-    public void modifyPassword(String mobile, String oldPwd, String pwd) {
+    public void modifyPassword(String mobile, String oldPwd, String pwd, Boolean isForced) {
         AccountInfoEntity entity = accountInfoDetailMapper.selectByMobile(mobile);
         if (entity != null) {
             //added by joy begin 晓庆说 这批空密码用户不应该在设置密码处 修改密码，提示：引导客户去密码登录；
-            if(StringUtil.isEmpty(entity.getPassword())){
+            if(!isForced && StringUtil.isEmpty(entity.getPassword())){
                 throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_RESET);
             }
             //added by joy end