From d56a4ae3aded7fecbecf98d33557f28dedc3abc6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:43 +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 |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 88379a1..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
@@ -320,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