fix: 重点人员、随手拍调整

src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java

@@ -3,17 +3,21 @@ package com.biutag.supervision.controller.mobileSupervision;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.biutag.supervision.common.UserContextHolder;
+import com.biutag.supervision.constants.AppConstants;
+import com.biutag.supervision.constants.enums.TaskTypeEnum;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.dto.TaskProblemDto;
 import com.biutag.supervision.pojo.entity.SupTaskPerson;
 import com.biutag.supervision.pojo.entity.SupTaskProblem;
+import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.TaskProblemQueryParam;
 import com.biutag.supervision.service.SupTaskProblemService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -30,6 +34,12 @@ public class TaskProblemController {
     @GetMapping
     public Result<Page<SupTaskProblem>> page(TaskProblemQueryParam queryParam) {
         LambdaQueryWrapper<SupTaskProblem> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StrUtil.isNotBlank(queryParam.getTaskType()), SupTaskProblem::getTaskType, queryParam.getTaskType())
+                        .eq(Objects.nonNull(queryParam.getTaskId()), SupTaskProblem::getTaskType, queryParam.getTaskType());
+        UserAuth user = UserContextHolder.getCurrentUser();
+        if (TaskTypeEnum.problem_shooting.name().equals(queryParam.getTaskType()) && !AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) ) {
+            queryWrapper.eq(SupTaskProblem::getCreateUsername, user.getUserName());
+        }
         queryWrapper.orderByDesc(SupTaskProblem::getCreateTime);
         Page<SupTaskProblem> page = taskProblemService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
         page.getRecords().forEach(item -> {

src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java

@@ -54,6 +54,8 @@ public class SupTaskProblem {
     @TableField("create_time")
     private LocalDateTime createTime;
 
+    private String createUsername;
+
     private String distributionState;
 
     private String taskType;

src/main/java/com/biutag/supervision/pojo/param/TaskProblemQueryParam.java

@@ -10,4 +10,8 @@ import lombok.Setter;
 @Setter
 @Getter
 public class TaskProblemQueryParam extends BasePage {
+
+    private String taskType;
+
+    private Integer taskId;
 }

src/main/java/com/biutag/supervision/service/SupTaskProblemService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.biutag.supervision.common.UserContextHolder;
 import com.biutag.supervision.constants.enums.DistributionStateEnum;
 import com.biutag.supervision.constants.enums.TaskStatusEnum;
 import com.biutag.supervision.constants.enums.TaskTypeEnum;
@@ -53,6 +54,7 @@ public class SupTaskProblemService extends ServiceImpl<SupTaskProblemMapper, Sup
             }
         }
         problem.setCreateTime(LocalDateTime.now());
+        problem.setCreateUsername(UserContextHolder.getCurrentUser().getUserName());
         problem.setDistributionState(DistributionStateEnum.UNDISTRIBUTED.getValue());
         if (Objects.nonNull(dto.getTaskId())) {
             SupTask task = taskService.getById(dto.getTaskId());