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 | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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 771dd88..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
@@ -50,15 +50,23 @@
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "keyword",required = false) String keyword,
+ @RequestParam(value = "isDivisionHead",required = false) String isDivisionHead,
@CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
-
- int num=IUserService.selectNum("2",keyword,ids,null);
+ List<SysUser> list ;
+ int num;
+ if (isDivisionHead!=null&&!isDivisionHead.equals("")){
+ list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,isDivisionHead);
+ num=IUserService.selectNum("2",keyword,ids,isDivisionHead);
+ }
+ else{
+ list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
+ num=IUserService.selectNum("2",keyword,ids,null);
+ }
return getDataTable(list,num);
}
@@ -116,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");
@@ -131,6 +145,8 @@
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));
}
@@ -138,15 +154,23 @@
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());
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));
}
@@ -183,10 +207,20 @@
//是否是部门领导（1是 2不是）
if(StringUtils.equals("1",config.getIsDivisionHead()))
{
- 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
{
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ config.setDataPermission(config.getDepartmentId());
+ }
config.setRoleIds("2");
}
--
Gitblit v1.7.1