fix: 无密码编辑保存密码

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

@@ -15,7 +15,9 @@ import com.pica.cloud.account.account.server.resp.HospitalSaasUserDetailResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserDto;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserEditResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserResp;
+import com.pica.cloud.account.account.server.service.AccountService;
 import com.pica.cloud.account.account.server.service.HospitalSaasUserService;
+import com.pica.cloud.account.account.server.service.PasswordService;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.ExecutorServiceUtils;
 import com.pica.cloud.account.account.server.util.captcha.CommonUtils;
@@ -70,6 +72,12 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
     @Autowired
     private StoreCertifyServiceClient storeCertifyServiceClient;
 
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired
+    private PasswordService passwordService;
+
     @Override
     @Transactional
     public int register(HospitalSaasUserReq req, Long doctorId) {
@@ -198,12 +206,26 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
     public int upsert(HospitalSaasUserReq req, Long doctorId) {
         //走更新的逻辑,只可以更新角色和备注
         String mobileEncrypt = AESUtil.encryptV0(req.getMobile());
-        Account account = accountMapper.getByMobilePhone(mobileEncrypt);
-        String comment = account.getComment();
-        if (!Objects.equals(comment, req.getComment())) {
+
+        Account accountExist = accountMapper.getByMobilePhone(mobileEncrypt);
+
+        if (accountExist == null) {
+            throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前用户不存在");
+        }
+        Account account = new Account();
+        account.setId(doctorId);
+        account.setModifyId(doctorId);
+        account.setModifyTime(Calendar.getInstance().getTime());
+        if (StringUtils.isNotEmpty(req.getComment())) {
             account.setComment(req.getComment());
-            accountMapper.updateByIdSelective(account);
         }
+        accountService.updateAccountById(account);
+
+        /** 修改密码 */
+        if (StringUtils.isNotEmpty(req.getPassword()) && StringUtils.isEmpty(accountExist.getPassword())) {
+            passwordService.modifyPassword(mobileEncrypt, accountExist.getPassword(), req.getPassword());
+        }
+
         Map  map =new HashMap(3);
         map.put("id", req.getId());
         map.put("modifiedId", doctorId);