From 8f9845717f6989792e2a6003adf5fe12ff0a9540 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 16:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 6895a5f..5e83ba4 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
@@ -136,10 +136,11 @@
user.setDepartmentIds(config.getDepartmentIds());
user.setDepartmentIdStr(config.getDepartmentIdStr());
user.setMoreDepartmentIds(config.getMoreDepartmentIds());
- user.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
user.setMattersIds(config.getMattersIds());
user.setMasterNames(config.getMasterNames());
user.setMattersNames(config.getMattersNames());
+ if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
+ user.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
//提示用户名或密码错误
return toAjax(IUserService.updateConfig(user));
}
@@ -156,6 +157,8 @@
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId()+"");
+ if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
+ config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
config.setIsDivisionHead(config.getIsDivisionHead());
return toAjax(IUserService.insertConfig(config));
}
@@ -192,8 +195,11 @@
//是否是部门领导（1是 2不是）
if(StringUtils.equals("1",config.getIsDivisionHead()))
{
- config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
- config.setRoleIds("13");
+ 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