From afaadcfef9aa4213533d2055e77ce2a69fe087f1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 14:01:02 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 13 ++++++++++---
1 files changed, 10 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 b24df3f..771dd88 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
@@ -56,9 +56,9 @@
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);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
- int num=IUserService.selectNum("2",keyword,ids);
+ int num=IUserService.selectNum("2",keyword,ids,null);
return getDataTable(list,num);
}
@@ -72,7 +72,7 @@
@ApiOperation("新增导办用户接口")
@PostMapping("/add")
@Authorization
- public ResultData insertConfig(@RequestBody SysUser config)
+ public ResultData insertConfig(@RequestBody SysUser config,@CurrentUser SysUser sysUser)
{
Assert.notNull(config, "parameter can not be empty");
@@ -125,6 +125,12 @@
user.setIsDivisionHead(config.getIsDivisionHead());
user.setStatus(config.getStatus());
user.setUpdateTime(LocalDateTime.now());
+ user.setDepartmentIds(config.getDepartmentIds());
+ user.setDepartmentIdStr(config.getDepartmentIdStr());
+ user.setMoreDepartmentIds(config.getMoreDepartmentIds());
+ user.setMattersIds(config.getMattersIds());
+ user.setMasterNames(config.getMasterNames());
+ user.setMattersNames(config.getMattersNames());
//提示用户名或密码错误
return toAjax(IUserService.updateConfig(user));
}
@@ -137,6 +143,7 @@
{
config.setRoleIds("2");
}
+ config.setCreateBy(sysUser.getUserId());
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId()+"");
--
Gitblit v1.7.1