bug修复

mitao

2024-05-23 1e779629fc4257df807a48280f3fc23eae752653

 meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java

@@ -15,6 +15,7 @@
import com.sinata.rest.modular.auth.util.AccountCheckUtil;
import com.sinata.rest.modular.auth.util.JwtTokenUtil;
import com.sinata.rest.modular.auth.util.ThreadPoolUtil;
import com.sinata.rest.modular.mall.job.UserV3UpDownWork;
import com.sinata.rest.modular.member.controller.common.body.BodyPwd;
import com.sinata.rest.modular.member.controller.common.body.BodyRegister;
import com.sinata.rest.modular.member.controller.common.body.BodyUser;
@@ -255,6 +256,7 @@
    @PostMapping(value = "/edit")
    @ApiOperation(value = "修改用户信息", notes = "字段有就传，没有就不传", response = RegisterVo.class)
    public Object editUser(@RequestBody BodyUser info, HttpServletRequest request) {
        log.info("修改用户信息---------->：{}", info);
        /************************   拦截Token校验-begin   ******************************/
        // 验证用户ID
        int authCode = authUserId(request, info.userId);
@@ -367,7 +369,13 @@
        vo.setIdCard(user.getIdCard());
        vo.setImAccount(user.getImAccount());
        vo.setImPassword(user.getImPassword());

        //在职
        boolean condition1 = user.getIsLeaveOffice() == 0 && user.getAuditState() == 1;
        //已提交申请
        boolean condition2 = user.getIsLeaveOffice() == 1 && user.getAuditState() == 0;
        if (condition1 || condition2) {
            vo.setModifyUserInfo(true);
        }
        return vo;
    }