From 3d2b51ea4520533de5e78f88dddf5b5c7dce4247 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 06 六月 2024 15:56:18 +0800
Subject: [PATCH] 管理后台添加营销员导入功能
---
meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java b/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
index 07ec660..49bd24e 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
+++ b/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;
@@ -234,7 +235,7 @@
wrapper.eq(MemUser::getPhone, phone);
MemUser user = userService.getOne(wrapper);
if (user == null) {
- return ApiUtils.returnNG(null, "帐号或密码错误");
+ return ApiUtils.returnNG(null, "手机号不存在，请注册");
}
if (1 == user.getIsLock()) {
return ApiUtils.returnNG(null, "您帐号已被锁定");
@@ -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);
@@ -280,6 +282,7 @@
user.setAgentProvinceCode(province);
user.setAgentCityCode(city);
user.setAgentCountyCode(county);
+ log.info("用户：{}修改了营销员城市地址",user.getRealName());
}
// user.setSignature(info.signature);
// user.setAddress(info.address);
@@ -367,7 +370,14 @@
vo.setIdCard(user.getIdCard());
vo.setImAccount(user.getImAccount());
vo.setImPassword(user.getImPassword());
-
+ 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;
}
--
Gitblit v1.7.1