From e337bdcc9655f0a40067834ef760396e7811b14e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 20 十月 2022 15:45: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 | 7 ++++---
1 files changed, 4 insertions(+), 3 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..0024aac 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
@@ -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());
@@ -379,7 +379,7 @@
if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
{
userId=null;
- ids= PermissionUtil.getPermission(sysUser);
+ ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
else
{
@@ -404,10 +404,11 @@
if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
{
userId=null;
- ids= PermissionUtil.getPermission(sysUser);
+ ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
else
{
+ ids=null;
userId=sysUser.getUserId()+"";
}
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
--
Gitblit v1.7.1