From 5944c9ea054165cc4adfa79254f9b724abc371db Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 03 九月 2024 13:52:00 +0800
Subject: [PATCH] 执法记录条件
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index 3276c3e..dfec893 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -49,14 +49,20 @@
@ApiOperation("鑾峰彇鍚岃浜�")
@GetMapping("/peerList")
@Cacheable(value = "sysUser:peerList")
- public AjaxResult peerList(String nickName, String deptId)
+ public AjaxResult peerList(String nickName, Long deptId)
{
+ String queryScope = " (dept_id = {} OR dept_id IN ( SELECT dept_id FROM sys_dept WHERE find_in_set({}, ancestors) )) ";
+ if (deptId==null){
+ deptId = deptService.getCheckDeptIdByLoginDeptId(SecurityUtils.getDeptId());
+ } else {
+ deptId = deptService.getCheckDeptIdByLoginDeptId(deptId);
+ }
List<SysUser> list = userService.list(userService.lq()
.ne(SysUser::getUserType,"02")
.ne(SysUser::getUserName,"admin")
.ne(SysUser::getUserId, SecurityUtils.getUserId())
- .like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
- .eq(deptId!=null, SysUser::getDeptId, deptId)
+ .likeRight(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+ .apply( StringUtils.format(queryScope, deptId, deptId))
);
list.forEach(user->{
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
@@ -70,6 +76,9 @@
@GetMapping("/commonList")
public TableDataInfo commonList(EnforceOrderQueryBo bo)
{
+ if (bo.getCheckDeptId()==null){
+ bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(SecurityUtils.getDeptId()));
+ }
startPage();
List<EnforceOrderVo> list = iEnforceOrderService.queryCommonList(bo);
return getDataTable(list);
--
Gitblit v1.9.1