Merge branch 'dev' of...

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -2,6 +2,8 @@ package com.ruoyi.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.DataStatisticsUtils;
@@ -104,6 +106,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     @Autowired
     private TaskUserRelationMapper taskUserRelationMapper;
 
+    @Autowired
+    private TestRecordsMapper testRecordsMapper;
+
     @Override
     public List<Task> findList(TaskListRequest request) {
         return taskMapper.findList(request);
@@ -1078,25 +1083,28 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         // 小组成员
         List<TaskUserRelation> relation = taskUserRelationService.selectQTeamMembers(id);
 
-        // 小组成员姓名、部门
-        List<UserNameResponse> userList = taskMapper.findByRelation(relation);
+        if(relation != null && relation.size() != 0) {
 
-        for (UserNameResponse response : userList) {
-            for (TaskUserRelation taskUserRelation : relation) {
-                if (Objects.equals(response.getUserId(), taskUserRelation.getUserId())) {
-                    taskUserRelation.setName(response.getName());
-                    taskUserRelation.setDeptName(response.getDeptName());
+            // 小组成员姓名、部门
+            List<UserNameResponse> userList = taskMapper.findByRelation(relation);
+
+            for (UserNameResponse response : userList) {
+                for (TaskUserRelation taskUserRelation : relation) {
+                    if (Objects.equals(response.getUserId(), taskUserRelation.getUserId())) {
+                        taskUserRelation.setName(response.getName());
+                        taskUserRelation.setDeptName(response.getDeptName());
+                    }
                 }
             }
-        }
 
-        // 小组成员状态
-        List<TaskUserRelation> relationList = taskUserRelationMapper.findByIdList(relation);
+            // 小组成员状态
+            List<TaskUserRelation> relationList = taskUserRelationMapper.findByIdList(relation);
 
-        for ( TaskUserRelation userRelation : relationList) {
-            for (TaskUserRelation taskUserRelation : relation) {
-                if (Objects.equals(userRelation.getUserId(), taskUserRelation.getUserId())) {
-                    taskUserRelation.setStatus(userRelation.getStatus());
+            for ( TaskUserRelation userRelation : relationList) {
+                for (TaskUserRelation taskUserRelation : relation) {
+                    if (Objects.equals(userRelation.getUserId(), taskUserRelation.getUserId())) {
+                        taskUserRelation.setStatus(userRelation.getStatus());
+                    }
                 }
             }
         }