From 59c76e8ec3fbcb474993f3373ae4a03b4d604ff9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 13:57:24 +0800
Subject: [PATCH] 修改导办人员即是领导又是工人 bug
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index 1353e89..58dd366 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -87,7 +87,8 @@
@GetMapping("/orderdata")
@Authorization
public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
- @RequestParam(value = "orderNum",required = false) String orderNum)
+ @RequestParam(value = "orderNum",required = false) String orderNum,
+ @CurrentUser SysUser sysUser)
{
if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
{
@@ -95,7 +96,7 @@
}
GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
- order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
+ order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));
return ResultData.success(order);
}
@@ -236,7 +237,7 @@
WxUtil wxUtil=new WxUtil();
String accessToken="0";
try {
- accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
+ accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -373,6 +374,9 @@
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "matterName",required = false) String matterName,
@RequestParam(value = "status",required = false) String status,
+ @RequestParam(value = "createTimeStartTime",required = false) String createTimeStartTime,
+ @RequestParam(value = "createTimeTimeEndTime",required = false) String createTimeTimeEndTime,
+ @RequestParam(value = "classifyId",required = false)String classifyId,
@CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
@@ -383,18 +387,16 @@
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
-// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
-// {
-// userId=null;
-// }
-// else
-// {
-// ids=null;
-// userId=sysUser.getUserId()+"";
-// }
- userId=sysUser.getUserId()+"";
- ids=new ArrayList<>();
- ids.add(sysUser.getDepartmentId());
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
}
else
{
@@ -402,7 +404,7 @@
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
- matterName,ids,status,userId);
+ matterName,ids,status,userId,createTimeStartTime,createTimeTimeEndTime,classifyId);
int num=iGuideRepairOrderService.countConfigList(matterName,ids,status,userId);
return getDataTable(list,num);
}
@@ -418,18 +420,16 @@
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
-// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
-// {
-// userId=null;
-// }
-// else
-// {
-// ids=null;
-// userId=sysUser.getUserId()+"";
-// }
- userId=sysUser.getUserId()+"";
- ids=new ArrayList<>();
- ids.add(sysUser.getDepartmentId());
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
}
else
{
--
Gitblit v1.7.1