Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -197,7 +197,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
 
         //数据权限为2部门管理员查询本部门及子部门工单数据
-        if (RoleEnum.SUPER_ADMIN.getCode() == type) {
+        if (RoleEnum.ADMIN.getCode() == type) {
             //根据部门id获取本部门及子部门列表
             String deptId = user.getDeptId();
             if(StringUtils.isEmpty(deptId)){
@@ -234,7 +234,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
 
         //数据权限为3普通用户查询本部门数据
-        if (RoleEnum.SUPER_ADMIN.getCode() == type) {
+        if (RoleEnum.ORDINARY_USER.getCode() == type) {
             String deptId = user.getDeptId();
             if(StringUtils.isEmpty(deptId)){
                 return JsonResult.error(QueryDeptChildListCodeEnum.DEPT_ID_IS_NULL.getCode(),QueryDeptChildListCodeEnum.DEPT_ID_IS_NULL.getMsg());
@@ -262,7 +262,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             return JsonResult.success(pageData);
         }
 
-        return JsonResult.error(WorkOrderEnum.DATA_IS_NULL.getCode(), WorkOrderEnum.DATA_IS_NULL.getMsg());
+        return JsonResult.success("数据为空");
     }
 
     /**
@@ -293,6 +293,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 return null;
             }
             workOrderInfoList = this.getWorkOrderList(workPageData, user);
+            System.out.println("------->" + workOrderInfoList);
         }
         return workOrderInfoList;
     }
@@ -368,6 +369,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
         //工单的待处理问题个数不为0时 重新返回
         WorkOrderInfoList = workOrderList.stream().filter(h -> h.getPromTodo() != 0).collect(Collectors.toList());
+
+        System.out.println("----->"+ WorkOrderInfoList);
+
         return WorkOrderInfoList;
     }