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 | 30 ++++++++++++++++++++----------
1 files changed, 20 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 dd26e62..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;
/**
@@ -387,6 +388,8 @@
// userId=sysUser.getUserId()+"";
// }
userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
}
else
{
@@ -406,19 +409,26 @@
public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
{
WorkOrder workOrder=new WorkOrder();
- List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<String> ids=null;
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
- {
- userId=null;
- }
- else
- {
- ids=null;
- userId=sysUser.getUserId()+"";
- }
+// 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
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
--
Gitblit v1.7.1