[修改]查询自己相关工单

core/src/main/java/com/keymobile/governworkorder/core/service/impl/WorkOrderServiceImpl.java

@@ -133,12 +133,11 @@ public class WorkOrderServiceImpl implements WorkOrderService {
             Query processQuery = new Query();
             processQuery.addCriteria(Criteria.where("userName").is(userName));
             processQuery.fields().include("workOrderId");
-            List<Document> processDocs = mongoTemplate.findDistinct(processQuery, "workOrderId", WorkOrderInfo.class, Document.class);
+            List<String> processDocs = mongoTemplate.findDistinct(processQuery, "workOrderId", WorkOrderProcess.class, String.class);
             if (CollectionUtils.isEmpty(processDocs)) {
                 return PageableExecutionUtils.getPage(Collections.emptyList(), pageable, () -> 0);
             }
-            List<String> workOrderIds = processDocs.stream().map(e -> e.getString("workOrderId")).collect(Collectors.toList());
-            query.addCriteria(Criteria.where("_id").in(workOrderIds));
+            query.addCriteria(Criteria.where("_id").in(processDocs));
         } else {
             //如果非待办和已办，则根据账号权限查询关联数据。 自理工单创建组成员可以查看所有数据，其他则只能查看自己相关数据（待办、已办）
             boolean createUserFlag = checkCreatePermission(userName);
@@ -146,15 +145,13 @@ public class WorkOrderServiceImpl implements WorkOrderService {
                 Query processQuery = new Query();
                 processQuery.addCriteria(Criteria.where("userName").is(userName));
                 processQuery.fields().include("workOrderId");
-                List<Document> processDocs = mongoTemplate.findDistinct(processQuery, "workOrderId", WorkOrderInfo.class, Document.class);
+                List<String> processDocs = mongoTemplate.findDistinct(processQuery, "workOrderId", WorkOrderProcess.class, String.class);
                 if (CollectionUtils.isEmpty(processDocs)) {
                     query.addCriteria(Criteria.where("nextUserName").regex("(^|,)" + userName + "(,|$)"));
                 } else {
-                    List<String> workOrderIds = processDocs.stream().map(e -> e.getString("workOrderId")).collect(Collectors.toList());
-                    query.addCriteria(Criteria.where("workOrderId").in(workOrderIds));
                     query.addCriteria(new Criteria().orOperator(
                             Criteria.where("nextUserName").regex("(^|,)" + userName + "(,|$)"),
-                            Criteria.where("_id").in(workOrderIds)));
+                            Criteria.where("_id").in(processDocs)));
                 }
             }
         }