bug 修复

张志伟
1 parent d6c5c380
Showing 2 changed files with 7 additions and 2 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowApiBizService.kt
@@ -211,7 +211,8 @@
                 </foreach>
             </if>
             <if test="condition.userId !=null">
-                and t1.follow_user = #{condition.userId}
+                and (t1.follow_user = #{condition.userId}
+                or t1.finish_user = #{condition.userId})
             </if>
             and DATE(t1.close_time) BETWEEN DATE(from_unixtime(#{condition.startTime})) AND
             DATE(from_unixtime(#{condition.endTime}))
@@ -83,7 +83,7 @@ class FollowApiBizService(
             followTypeEnum.value
         )
         val dtoList = clueTaskService.queryShouldBeCompleted(search)
-        return dtoList.map {
+        val resultList = dtoList.map {
             ShouldBeCompletedResult(
                 it.vin,
                 it.userId,
@@ -92,6 +92,10 @@ class FollowApiBizService(
                 it.state
             )
         }
+        if (Objects.nonNull(query.userId)) {
+            return resultList.filter { it.userId == query.userId }
+        }
+        return resultList
     }
  
     fun queryAccidentFollowerByPlate(plateNo: String, groupId: Long): ClueTask? {