From c996652af0971b8ea5e176f0771c381b6012b48f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 18:10:16 +0800
Subject: [PATCH] 修改领导权限 bug
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 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 c533fca..c8556f4 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
@@ -3,8 +3,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ISysUserService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -29,6 +33,12 @@
ISysUserService IUserService;
+ @Autowired
+ IGuideRepairOrderService iGuideRepairOrderService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
/**
* 查询列表
*
@@ -38,14 +48,17 @@
@GetMapping("/getlist")
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "keyword",required = false) String keyword,
+ @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<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2");
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids);
- int num=IUserService.selectNum("2");
+ int num=IUserService.selectNum("2",keyword,ids);
return getDataTable(list,num);
}
@@ -83,17 +96,35 @@
return error("昵称不能为空");
}
- SysUser user = IUserService.getUserByAccount(config.getLoginName());
- if (user != null) {
- //提示用户名或密码错误
- return error("该账户已存在！");
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("部门不能为空");
}
config.setUserType("2");
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
+ if (user != null)
+ {
+ user.setPassword(config.getPassword());
+ user.setDepartmentId(config.getDepartmentId());
+ user.setUserName(config.getUserName());
+ user.setPhonenumber(config.getPhonenumber());
+ user.setLoginName(config.getLoginName());
+ user.setMasterIds(config.getMasterIds());
+ user.setRoleIds("2");
+ user.setUserType("2");
+ user.setIsDivisionHead("1");
+ user.setStatus(config.getStatus());
+ user.setUpdateTime(LocalDateTime.now());
+ //提示用户名或密码错误
+ return toAjax(IUserService.updateConfig(user));
+ }
+ config.setRoleIds(2+"");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
- config.setUserId(Snowflake.getId());
+ config.setUserId(Snowflake.getId()+"");
+ config.setIsDivisionHead("1");
return toAjax(IUserService.insertConfig(config));
}
@@ -143,7 +174,17 @@
{
return error("userId不能为空");
}
- return toAjax(IUserService.deleteConfigById(userId));
+
+ int a=iGuideRepairOrderService.countUser(userId,"2");
+ if(a>0)
+ {
+ return error("该人员有工单未处理完不能删除");
+ }
+ SysUser user=IUserService.selectData(userId,null,null);
+ user.setUserType("4");
+ user.setRoleIds("4");
+ user.setIsDivisionHead("2");
+ return toAjax(IUserService.updateConfig(user));
}
/**
@@ -179,7 +220,8 @@
@GetMapping("/selectListByDepartmentId")
@Authorization
public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
- @RequestParam(value = "classifyId",required = false) String classifyId){
+ @RequestParam(value = "classifyId",required = false) String classifyId)
+ {
return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
}
@@ -190,8 +232,8 @@
@ApiOperation(" 查询导办用户列表（不分页）")
@GetMapping("/queryList")
@Authorization
- public ResultData queryList(){
- return ResultData.success(IUserService.queryList(2));
+ public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
+ return ResultData.success(IUserService.queryList(2,keyWord));
}
}
--
Gitblit v1.7.1