From e07de2546b2b67dfdb3a7f9961420b847ef72685 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 27 十月 2022 11:21:10 +0800
Subject: [PATCH] 修改导办人员登录系统导办列表数据不对 bug
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 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 7fd0d50..f461550 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
@@ -23,6 +23,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -180,7 +181,6 @@
entity.setFromUserId(sysUser.getUserId()+"");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setGuideId(order.getId().toString());
- order=iGuideRepairOrderService.setTimeoutTim(order);
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
@@ -332,7 +332,7 @@
GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
- guideEvolveEntity.setState("3");
+ guideEvolveEntity.setState("13");
guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
guideEvolveEntity.setGuideId(entity.getId().toString());
@@ -376,14 +376,24 @@
List<String> ids=null;
String userId=null;
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- userId=null;
- ids= PermissionUtil.getPermission(sysUser);
+// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+// {
+// userId=null;
+// }
+// else
+// {
+// ids=null;
+// userId=sysUser.getUserId()+"";
+// }
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
}
else
{
- userId=sysUser.getUserId()+"";
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
@@ -401,15 +411,26 @@
WorkOrder workOrder=new WorkOrder();
List<String> ids=null;
String userId=null;
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- userId=null;
- ids= PermissionUtil.getPermission(sysUser);
+// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+// {
+// userId=null;
+// }
+// else
+// {
+// ids=null;
+// userId=sysUser.getUserId()+"";
+// }
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
}
else
{
- userId=sysUser.getUserId()+"";
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
+
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null,userId));
workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null,null,userId));
--
Gitblit v1.7.1