From e9804708c0bf27e9b85c09acf21d8b7c705f9ffb Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 09 十一月 2022 13:26:49 +0800
Subject: [PATCH] 1.居民查看的导办工单里的工作人员姓名脱敏显示,显示为”姓+老师“,示例”李老师“2.后台导办工单可以按用户提交时间、办事指南分类进行筛选

---
 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 96e4eee..6c012c3 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
@@ -86,7 +86,8 @@
     @GetMapping("/orderdata")
     @Authorization
     public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
-                                       @RequestParam(value = "orderNum",required = false)  String orderNum)
+                                       @RequestParam(value = "orderNum",required = false)  String orderNum,
+                                       @CurrentUser SysUser sysUser)
     {
         if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
         {
@@ -94,7 +95,7 @@
         }
 
         GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
-        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
+        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));
 
         return ResultData.success(order);
     }
@@ -336,7 +337,7 @@
         {
             userId=sysUser.getUserId()+"";
         }
-        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
+        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
         int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
         return getDataTable(list,num);
     }

--
Gitblit v1.7.1