From fc076febec4f1e4b46beeca343f78010d8f8924d Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 24 十月 2023 21:06:44 +0800
Subject: [PATCH] 10.24。5
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index 79b3940..ae71ffa 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -110,22 +110,32 @@
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
String province = data.getProvince();
TCity province1 = cityService.getOne(new QueryWrapper<TCity>().eq("name", data.getProvince()));
+
+ if (province1!=null){
List<TCity> city = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, province1.getId()));
+ model.addAttribute("city",city);
+
+ }
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ if (data.getBirthday()!=null){
String format1 = format.format(data.getBirthday());
+ model.addAttribute("birthday",format1);
+ }
List<User> sales = userService.list(new QueryWrapper<User>().eq("deptid", 2));
model.addAttribute("list",list);
model.addAttribute("roleType",roleType);
model.addAttribute("sales",sales);
model.addAttribute("data",data);
- model.addAttribute("birthday",format1);
- model.addAttribute("city",city);
+
model.addAttribute("type",type);
model.addAttribute("isVip",data.getIsVip());
if (data.getVipEndTime()!=null){
SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
String format3 = format2.format(data.getVipEndTime());
model.addAttribute("vipEndTime",format3);
+ }else {
+ model.addAttribute("vipEndTime","");
+
}
if (data.getViplevelId()!=null){
// todo创建会员等级表
@@ -151,7 +161,7 @@
queryAppUser.setName(name);
queryAppUser.setPhone(phone);
queryAppUser.setIsVip(isVip);
- queryAppUser.setSalesmanUserName(salesmanUserName);
+// queryAppUser.setSalesmanUser(salesmanUserName);
if (province!=null && (!province.equals(""))){
TCity p = cityService.getOne(new QueryWrapper<TCity>().eq("code", province));
queryAppUser.setProvince(p.getName());
@@ -160,6 +170,9 @@
TCity c = cityService.getOne(new QueryWrapper<TCity>().eq("code", city));
queryAppUser.setCity(c.getName());
}
+ Integer objectType = UserExt.getUser().getObjectType();
+ queryAppUser.setInsertType(objectType);
+ queryAppUser.setTypeId(UserExt.getUser().getObjectId());
List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
@@ -172,7 +185,7 @@
for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
if (queryAppUserVO.getSalesmanUserId()!=null){
for (User sale : sales) {
- if (queryAppUserVO.getSalesmanUserId() == sale.getId()){
+ if (queryAppUserVO.getSalesmanUserId().equals(sale.getId())){
result.add(queryAppUserVO);
}
}
@@ -189,6 +202,9 @@
@RequestMapping("/addAppUser")
@ResponseBody
public Object addAppUser(@RequestBody TAppUser appUser){
+ Integer objectType = UserExt.getUser().getObjectType();
+ appUser.setInsertType(objectType);
+ appUser.setAddUserId(UserExt.getUser().getObjectId());
Object o = appUserClient.addAppUser1(appUser);
return o;
}
--
Gitblit v1.7.1