修改密码时 老密码null时报错

server/src/main/java/com/pica/cloud/account/account/server/enums/AccountExceptionEnum.java

@@ -65,6 +65,7 @@ public enum AccountExceptionEnum {
     PAT_MEMBER_HAS_BINDED_SELF("216556","该成员已被账户绑定为家庭成员，不需要再次绑定"),
     PAT_HAS_CREATE_ACCT("216557","初始居民已存在主账户"),
     PAT_QUERY_MAX("216558","查询参数过多"),
+    PICA_PASSWORD_RESET("216559", "空密码用户在个人中心设置密码时报错"),
 
     xxx_xxx("","");
 

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

@@ -18,6 +18,8 @@ import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.utils.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -52,18 +54,19 @@ public class PasswordServiceImpl implements PasswordService {
     @Autowired
     private ICacheClient cacheClient;
 
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
 
     @Override
     @Transactional
     public void modifyPassword(String mobile, String oldPwd, String pwd) {
         AccountInfoEntity entity = accountInfoDetailMapper.selectByMobile(mobile);
         if (entity != null) {
+            //added by joy begin 晓庆说 这批空密码用户不应该在设置密码处 修改密码，提示：引导客户去密码登录；
             if(StringUtil.isEmpty(entity.getPassword())){
-                entity.setPassword("");
-            }
-            if(StringUtil.isEmpty(oldPwd)){
-                oldPwd = "";
+                throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_RESET);
             }
+            //added by joy end
             if (entity.getPassword().equals(oldPwd)) {
                 Date currentTime = new Date();
                 AccountInfoEntity accountInfoEntity = new AccountInfoEntity();