From 01b70437d4ef3348e69b2af0dcbd7250e1234117 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 25 十一月 2022 13:54:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 9 +++++++++
1 files changed, 9 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 0dc583f..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");
@@ -204,7 +210,10 @@
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
--
Gitblit v1.7.1