From 2fed0b52d9c8e98d46c1eb8bd3876dafa60fc0b6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 25 十一月 2022 10:14:16 +0800
Subject: [PATCH] 1.修改导办数量可能是负数的问题
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index 3301408..fe35f40 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -191,7 +191,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);
}
@@ -331,9 +331,16 @@
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- 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
{
@@ -345,4 +352,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