修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -348,10 +348,6 @@ public class WorkOrderManageController {
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
         workOrderManageDto.setTaskNo(taskNo);
-        if(!org.springframework.util.StringUtils.isEmpty(startDate)&& !StringUtils.isEmpty(endDate)) {
-            workOrderManageDto.setStartDate(startDate);
-            workOrderManageDto.setEndDate(endDate);
-        }
         workOrderManageDto.setOrderStatus(orderStatus);
         workOrderManageDto.setOrderStatus(orderStatus);
         workOrderManageDto.setEventType(eventType);
@@ -361,6 +357,11 @@ public class WorkOrderManageController {
         workOrderManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
+
+        if(!org.springframework.util.StringUtils.isEmpty(startDate)&& !StringUtils.isEmpty(endDate)) {
+            workOrderManageDto.setStartDate(startDate);
+            workOrderManageDto.setEndDate(endDate);
+        }
         IPage<WorkOrderManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = workOrderManageService.selectPage(iPage, workOrderManageDto);
         Pagination<WorkOrderManageDto> pages = new Pagination<>(iPage);
@@ -386,6 +387,12 @@ public class WorkOrderManageController {
         }
         workOrderManageDto.setTaskNo(taskNo);
         workOrderManageDto.setOrderTypeId(orderTypeId);
+        workOrderManageDto.setTenantId(loginUser.getTenantId());
+        workOrderManageDto.setOrderTypeId(orderTypeId);
+        workOrderManageDto.setProgramItems(loginUser.getProgramItemList());
+        workOrderManageDto.setUserType(loginUser.getType());
+        //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+        workOrderManageDto.setPermissonType(loginUser.getPermissonType());
         if(loginUser.getId() != null) {
             workOrderManageDto.setCurrentUsers(String.format("%s", loginUser.getId()));
         }

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -101,10 +101,6 @@ public class PlanManageController {
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
         planManageDto.setKey(key);
-        if(!StringUtils.isEmpty(startDate)&& !StringUtils.isEmpty(endDate)) {
-            planManageDto.setStartDate(startDate);
-            planManageDto.setEndDate(endDate);
-        }
         planManageDto.setPlanStatus(planStatus);
         planManageDto.setTaskType(taskType);
         planManageDto.setTenantId(loginUser.getTenantId());
@@ -112,6 +108,10 @@ public class PlanManageController {
         planManageDto.setUserType(loginUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         planManageDto.setPermissonType(loginUser.getPermissonType());
+        if(!StringUtils.isEmpty(startDate)&& !StringUtils.isEmpty(endDate)) {
+            planManageDto.setStartDate(startDate);
+            planManageDto.setEndDate(endDate);
+        }
         IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
         Pagination<PlanManageDto> pages = new Pagination<>(iPage);
@@ -128,15 +128,22 @@ public class PlanManageController {
             @ApiParam(value = "计划单号或计划名称", required = false) @RequestParam(required = false) String key,
             @ApiParam(value = "计划起始日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String startDate,
             @ApiParam(value = "计划截至日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String endDate){
+
         PlanManageDto planManageDto = new PlanManageDto();
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
         planManageDto.setKey(key);
+        planManageDto.setTaskType(taskType);
+        planManageDto.setTenantId(loginUser.getTenantId());
+        planManageDto.setProgramItems(loginUser.getProgramItemList());
+        planManageDto.setUserType(loginUser.getType());
+        //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+        planManageDto.setPermissonType(loginUser.getPermissonType());
+
         if(!StringUtils.isEmpty(startDate)&& !StringUtils.isEmpty(endDate)) {
             planManageDto.setStartDate(startDate);
             planManageDto.setEndDate(endDate);
         }
-        planManageDto.setTaskType(taskType);
         if(loginUser.getId() != null) {
             planManageDto.setCurrentUsers(String.format("%s", loginUser.getId()));
         }