增加个人全量列表

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/ApplyController.java

@@ -25,7 +25,10 @@ import org.dromara.server.service.IProcessProgressService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 出差申请
@@ -56,7 +59,10 @@ public class ApplyController extends BaseController {
      */
     @GetMapping("/listAll/self")
     public R<List<ApplyVo>> listAllSelf(ApplyBo bo) {
-        bo.setApplyUserId(LoginHelper.getUserId());
+        bo = Optional.ofNullable(bo).orElse(new ApplyBo());
+        Map<String, Object> paramsMap = Optional.ofNullable(bo.getParams()).orElse(new HashMap<>());
+        paramsMap.put("phone", LoginHelper.getLoginUser().getPhonenumber());
+        bo.setParams(paramsMap);
         List<ApplyVo> list = applyService.queryList(bo);
         return R.ok(list);
     }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/ApplyServiceImpl.java

@@ -67,6 +67,15 @@ public class ApplyServiceImpl extends AbstractBaseService<ApplyVo, ApplyBo, Appl
         lqw.eq(bo.getEndTime() != null, Apply::getEndTime, bo.getEndTime());
         lqw.eq(StringUtils.isNotBlank(bo.getApplyReason()), Apply::getApplyReason, bo.getApplyReason());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Apply::getStatus, bo.getStatus());
+        Optional.ofNullable(params).map(map -> map.get("phone"))
+            .ifPresent(phone -> {
+                boolean result = Objects.nonNull(phone);
+                if (result) {
+                    List<ApplyPerson> apList = applyPersonMapper.selectList(new LambdaQueryWrapper<ApplyPerson>()
+                        .eq(ApplyPerson::getPhone, phone.toString()));
+                    lqw.in(Apply::getId, CollectionUtils.isEmpty(apList) ? List.of(-1) : StreamUtils.toList(apList, ApplyPerson::getApplyId));
+                }
+            });
         return lqw;
     }