From 45a27814a10252ebc36e435aee5ca3a4b3decdc4 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 26 十月 2022 13:40:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 9387319..dd26e62 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
@@ -180,7 +180,6 @@
entity.setFromUserId(sysUser.getUserId()+"");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setGuideId(order.getId().toString());
- order=iGuideRepairOrderService.setTimeoutTim(order);
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
@@ -374,19 +373,24 @@
Assert.notNull(pageSize, "pageSize 不能为空");
Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
- 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()+"";
+ }
+ else
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
--
Gitblit v1.7.1