From 20681d803038c3a25a49879c20f08e391b566f0d Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 15:24:30 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 bfaed3c..a916a70 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
@@ -58,11 +58,15 @@
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<SysUser> list ;
- if (isDivisionHead!=null&&!isDivisionHead.equals(""))
+ int num;
+ if (isDivisionHead!=null&&!isDivisionHead.equals("")){
list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,isDivisionHead);
- else
+ num=IUserService.selectNum("2",keyword,ids,isDivisionHead);
+ }
+ else{
list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
- int num=IUserService.selectNum("2",keyword,ids,null);
+ num=IUserService.selectNum("2",keyword,ids,null);
+ }
return getDataTable(list,num);
}
@@ -132,7 +136,6 @@
user.setDepartmentIds(config.getDepartmentIds());
user.setDepartmentIdStr(config.getDepartmentIdStr());
user.setMoreDepartmentIds(config.getMoreDepartmentIds());
- user.setDataPermission(config.getMoreDepartmentIds());
user.setMattersIds(config.getMattersIds());
user.setMasterNames(config.getMasterNames());
user.setMattersNames(config.getMattersNames());
@@ -152,6 +155,8 @@
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId()+"");
+ if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
+ user.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
config.setIsDivisionHead(config.getIsDivisionHead());
return toAjax(IUserService.insertConfig(config));
}
@@ -188,8 +193,11 @@
//是否是部门领导（1是 2不是）
if(StringUtils.equals("1",config.getIsDivisionHead()))
{
- config.setDataPermission(config.getMoreDepartmentIds());
- 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