更新密码接口修改

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BackUserAccountController.java

@@ -69,8 +69,8 @@ public class BackUserAccountController extends BaseController {
     @ApiOperation(value = "账号管理-修改密码")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("updatePassword")
-    public ResultBody updatePassword(@Validated(value = {UpdatePassword.class}) @RequestBody BUserAccountVO account) {
-        return backUserAccountService.updatePassword(account);
+    public ResultBody updatePassword(@Validated(value = {UpdatePassword.class}) @RequestBody BUserAccountVO account, HttpServletRequest request) {
+        return backUserAccountService.updatePassword(account, this.getUserLoginInfoFromRedis(request));
     }
 
     @ApiOperation(value = "feign-验证用户密码")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/BackUserAccountService.java

@@ -62,9 +62,10 @@ public interface BackUserAccountService {
      * 修改用户密码
      *
      * @param account
+     * @param loginSuccessDTO
      * @return
      */
-    ResultBody updatePassword(BUserAccountVO account);
+    ResultBody updatePassword(BUserAccountVO account, LoginSuccessDTO loginSuccessDTO);
 
     /**
      * 内部确认用户密码

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -206,7 +206,13 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
     }
 
     @Override
-    public ResultBody updatePassword(BUserAccountVO account) {
+    public ResultBody updatePassword(BUserAccountVO account, LoginSuccessDTO loginSuccessDTO) {
+        if (loginSuccessDTO.getAppUserAccountId() != null) {
+            CompanyInfoVO appCompanyInfoUId = companyService.getAppCompanyInfoUId(loginSuccessDTO.getAppUserAccountId());
+            if (!appCompanyInfoUId.getLeader().equals(1)) {
+                return ResultBody.error(ResultEnum.NO_RIGHT_UPDATE_ERROR);
+            }
+        }
         if (!account.getPassWord().equals(account.getAlertPwd())) {
             return ResultBody.error(ResultEnum.PASSWORD_INCONSISTENT);
         }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -208,9 +208,9 @@ public class CooperationServiceImpl implements CooperationService {
         bUserAccountVO.setAccountNo(userAccountVO.getPhoneNum());
         bUserAccountVO.setUserName(userApplyTagDO.getApplyName());
         bUserAccountVO.setPhoneNum(userAccountVO.getPhoneNum());
-        String password = "YXF123456";
-        bUserAccountVO.setPassWord(password);
-        bUserAccountVO.setAlertPwd(password);
+        // String password = "YXF123456";
+        bUserAccountVO.setPassWord(userAccountVO.getPhoneNum());
+        bUserAccountVO.setAlertPwd(userAccountVO.getPhoneNum());
         bUserAccountVO.setAccountStatus(1);
         bUserAccountVO.setRoleId(RoleEnums.FRANCHISEE.getId());
         // 添加单位id