From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 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 0024aac..9387319 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
@@ -374,16 +374,19 @@
Assert.notNull(pageSize, "pageSize 不能为空");
Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=null;
+ List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
String userId=null;
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- userId=null;
- ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- }
- else
- {
- userId=sysUser.getUserId()+"";
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ userId=null;
+ }
+ else
+ {
+ ids=null;
+ userId=sysUser.getUserId()+"";
+ }
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
@@ -399,18 +402,21 @@
public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
{
WorkOrder workOrder=new WorkOrder();
- List<String> ids=null;
+ List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
String userId=null;
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- userId=null;
- ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ userId=null;
+ }
+ else
+ {
+ ids=null;
+ userId=sysUser.getUserId()+"";
+ }
}
- else
- {
- ids=null;
- userId=sysUser.getUserId()+"";
- }
+
//状态（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