管理后台添加营销员导入功能

mitao

2024-06-06 3d2b51ea4520533de5e78f88dddf5b5c7dce4247

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

@@ -282,6 +282,7 @@
            user.setAgentProvinceCode(province);
            user.setAgentCityCode(city);
            user.setAgentCountyCode(county);
            log.info("用户：{}修改了营销员城市地址",user.getRealName());
        }
        //  user.setSignature(info.signature);
        // user.setAddress(info.address);
@@ -369,8 +370,13 @@
        vo.setIdCard(user.getIdCard());
        vo.setImAccount(user.getImAccount());
        vo.setImPassword(user.getImPassword());
        if (user.getIsLeaveOffice() != -1 || user.getAuditState() != 2) {
            vo.setModifyUserInfo(true);
        vo.setIsLeaveOffice(user.getIsLeaveOffice());
        //在职
        boolean condition1 = user.getIsLeaveOffice() == 0 && user.getAuditState() == 1;
        //已提交申请
        boolean condition2 = user.getIsLeaveOffice() == 1 && user.getAuditState() == 0;
        if (condition1 || condition2) {
            vo.setModifyUserInfo(Boolean.FALSE);
        }
        return vo;
    }