From 61046f00aa8d504372a0fd6f26334846c4ba33dc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 15:52:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 87f4b83..88379a1 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -59,7 +59,7 @@
List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
HuaChengSysUser huaChengSysUser=null;
- if(list!=null || list.size()>0 )
+ if(list!=null && list.size()>0 )
{
huaChengSysUser=list.get(0);
}
@@ -250,6 +250,12 @@
config.setUserType("3");
config.setIsDivisionHead("1");
config.setUpdateTime(LocalDateTime.now());
+ config.setMasterIds(user2.getMasterIds());
+ config.setDepartmentIds(config.getDepartmentIds());
+ config.setDepartmentIdStr(config.getDepartmentIdStr());
+ config.setMattersIds(config.getMattersIds());
+ config.setMasterNames(config.getMasterNames());
+ config.setMattersNames(config.getMattersNames());
return toAjax(IUserService.updateConfig(config));
}
else
@@ -268,6 +274,12 @@
config.setUserType("3");
config.setIsDivisionHead("1");
config.setUpdateTime(LocalDateTime.now());
+ config.setMasterIds(user2.getMasterIds());
+ config.setDepartmentIds(config.getDepartmentIds());
+ config.setDepartmentIdStr(config.getDepartmentIdStr());
+ config.setMattersIds(config.getMattersIds());
+ config.setMasterNames(config.getMasterNames());
+ config.setMattersNames(config.getMattersNames());
return toAjax(IUserService.updateConfig(config));
}
else
@@ -281,7 +293,7 @@
config.setUserId(Snowflake.getId()+"");
config.setUserType("3");
config.setIsDivisionHead("1");
-
+ config.setMoreDepartmentIds(config.getDepartmentId());
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
@@ -308,7 +320,7 @@
{
return error("账户不能为空");
}
-
+ config.setPassword(null);
config.setUpdateBy(sys.getUserId()+"");
return toAjax(IUserService.updateConfig(config));
--
Gitblit v1.7.1