From 29952e1e673e87d4ac1fc8f7c2d6088c975fa99f Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 28 十一月 2022 11:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 5266576..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
@@ -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