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/GuideDoController.java | 18 ++++++++++++++++++
1 files changed, 18 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 5e83ba4..1ddb1db 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
@@ -124,9 +124,15 @@
if(StringUtils.equals("1",config.getIsDivisionHead()))
{
user.setRoleIds("13");
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ user.setDataPermission(config.getMoreDepartmentIds());
+ }
}
else
{
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ user.setDataPermission(config.getDepartmentId());
+ }
user.setRoleIds("2");
}
user.setUserType("2");
@@ -148,9 +154,15 @@
if(StringUtils.equals("1",config.getIsDivisionHead()))
{
config.setRoleIds("13");
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ config.setDataPermission(config.getMoreDepartmentIds());
+ }
}
else
{
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ config.setDataPermission(config.getDepartmentId());
+ }
config.setRoleIds("2");
}
config.setCreateBy(sysUser.getUserId());
@@ -198,11 +210,17 @@
if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
else
+ {
config.setDataPermission("0");
+ }
+
config.setRoleIds("13");
}
else
{
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ config.setDataPermission(config.getDepartmentId());
+ }
config.setRoleIds("2");
}
--
Gitblit v1.7.1