From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 87 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 77 insertions(+), 10 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 c7a8798..293b1c6 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);
-
- int num=IUserService.selectNum("2",keyword,ids);
+ 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);
}
@@ -66,13 +74,13 @@
/**
* 新增用户
*
- * @param config 参数配置信息
+ * @param config 参数配置信息-
* @return 结果
*/
@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");
@@ -112,19 +120,58 @@
user.setPhonenumber(config.getPhonenumber());
user.setLoginName(config.getLoginName());
user.setMasterIds(config.getMasterIds());
- user.setRoleIds("2");
+ //是否是部门领导（1是 2不是）
+ 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");
- user.setIsDivisionHead("1");
+ 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());
+ if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
+ user.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
//提示用户名或密码错误
return toAjax(IUserService.updateConfig(user));
}
- config.setRoleIds(2+"");
+ //是否是部门领导（1是 2不是）
+ 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()+"");
- config.setIsDivisionHead("1");
+ 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));
}
@@ -157,8 +204,28 @@
config.setUserType("2");
+ //是否是部门领导（1是 2不是）
+ if(StringUtils.equals("1",config.getIsDivisionHead()))
+ {
+ 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");
+ }
+
SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
- if (user != null)
+ if (user != null && !(user.getUserId().equals(config.getUserId())))
{
//提示用户名或密码错误
return ResultData.error("该手机账户已存在！请更换手机号");
--
Gitblit v1.7.1