From 19b96e1b86b3ffd8a75de1bcf95bcbce85fb36e8 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 18:21:32 +0800
Subject: [PATCH] 其他附件管理列表接口新增 创建人字段
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 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 88d3284..27f4325 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
@@ -237,7 +237,7 @@
WxUtil wxUtil=new WxUtil();
String accessToken="0";
try {
- accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
+ accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -387,18 +387,16 @@
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
-// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
-// {
-// userId=null;
-// }
-// else
-// {
-// ids=null;
-// userId=sysUser.getUserId()+"";
-// }
- userId=sysUser.getUserId()+"";
- ids=new ArrayList<>();
- ids.add(sysUser.getDepartmentId());
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
}
else
{
@@ -422,18 +420,16 @@
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
-// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
-// {
-// userId=null;
-// }
-// else
-// {
-// ids=null;
-// userId=sysUser.getUserId()+"";
-// }
- userId=sysUser.getUserId()+"";
- ids=new ArrayList<>();
- ids.add(sysUser.getDepartmentId());
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
}
else
{
@@ -473,4 +469,16 @@
}
+ /**
+ * 删除评论
+ * @return
+ */
+ @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
+ @GetMapping("/deleteComment")
+ @Authorization
+ public ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser SysUser sysUser){
+ return iGuideRepairOrderService.deleteComment(id,sysUser);
+ }
+
+
}
--
Gitblit v1.7.1