From bdbe40f077aa9ca2ec184707d3eab41af13def03 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 18:12:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 493289d..c8556f4 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -114,6 +114,7 @@
user.setMasterIds(config.getMasterIds());
user.setRoleIds("2");
user.setUserType("2");
+ user.setIsDivisionHead("1");
user.setStatus(config.getStatus());
user.setUpdateTime(LocalDateTime.now());
//提示用户名或密码错误
@@ -123,6 +124,7 @@
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId()+"");
+ config.setIsDivisionHead("1");
return toAjax(IUserService.insertConfig(config));
}
@@ -181,6 +183,7 @@
SysUser user=IUserService.selectData(userId,null,null);
user.setUserType("4");
user.setRoleIds("4");
+ user.setIsDivisionHead("2");
return toAjax(IUserService.updateConfig(user));
}
--
Gitblit v1.7.1