From fe8bc518d19fcabc536e554dfb186e45ef4d7f43 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 16:17:36 +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 5e83ba4..0dc583f 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
@@ -148,9 +148,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());
@@ -203,6 +209,9 @@
}
else
{
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ config.setDataPermission(config.getDepartmentId());
+ }
config.setRoleIds("2");
}
--
Gitblit v1.7.1