From dab9e6bb95925acaf3ca21eb1b3e66a6ebc73b32 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 11 十一月 2022 14:05:06 +0800
Subject: [PATCH] 修改导办人员修改手机号报错 bug
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 1353e89..172674f 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
@@ -87,7 +87,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))
{
@@ -95,7 +96,7 @@
}
GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
- order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
+ order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));
return ResultData.success(order);
}
@@ -373,6 +374,9 @@
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "matterName",required = false) String matterName,
@RequestParam(value = "status",required = false) String status,
+ @RequestParam(value = "createTimeStartTime",required = false) String createTimeStartTime,
+ @RequestParam(value = "createTimeTimeEndTime",required = false) String createTimeTimeEndTime,
+ @RequestParam(value = "classifyId",required = false)String classifyId,
@CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
@@ -393,8 +397,8 @@
// userId=sysUser.getUserId()+"";
// }
userId=sysUser.getUserId()+"";
- ids=new ArrayList<>();
- ids.add(sysUser.getDepartmentId());
+// ids=new ArrayList<>();
+// ids.add(sysUser.getDepartmentId());
}
else
{
@@ -402,7 +406,7 @@
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
- matterName,ids,status,userId);
+ matterName,ids,status,userId,createTimeStartTime,createTimeTimeEndTime,classifyId);
int num=iGuideRepairOrderService.countConfigList(matterName,ids,status,userId);
return getDataTable(list,num);
}
@@ -428,8 +432,8 @@
// userId=sysUser.getUserId()+"";
// }
userId=sysUser.getUserId()+"";
- ids=new ArrayList<>();
- ids.add(sysUser.getDepartmentId());
+// ids=new ArrayList<>();
+// ids.add(sysUser.getDepartmentId());
}
else
{
--
Gitblit v1.7.1