From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 f12ea20..b831eec 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,6 +320,13 @@
{
return error("账户不能为空");
}
+
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("请选择部门");
+ }
+
+ config.setMoreDepartmentIds(config.getDepartmentId());
config.setPassword(null);
config.setUpdateBy(sys.getUserId()+"");
--
Gitblit v1.7.1