请假记录筛选条件

FullCardClient/src/main/java/com/zhongshu/card/client/model/attendance/LeaveQueryParam.java

@@ -16,8 +16,6 @@ public class LeaveQueryParam {
     private String projectId;
 
     @Schema(description = "应用场景id")
-    @NotEmpty(message = "应用场景不能为空")
-    @NotNull(message = "应用场景不能为null")
     private String sceneId;
 
     @Schema(description = "查询类型")

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/pay/PayTestController.java

@@ -1,44 +0,0 @@
-//package com.zhongshu.card.server.core.controller.pay;
-//
-//import com.github.microservice.pay.client.service.ledger.TransactionLogService;
-//import com.github.microservice.pay.client.service.product.SenselessPayService;
-//import com.github.microservice.types.payment.PaymentType;
-//import com.zhongshu.card.server.core.service.pay.ChinaumsSenselessPayService;
-//import com.zhongshu.card.server.core.service.pay.SettleService;
-//import io.swagger.v3.oas.annotations.Parameter;
-//import io.swagger.v3.oas.annotations.tags.Tag;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//
-//@RestController
-//@RequestMapping("payTest")
-//@Tag(name = "资金测试", description = "机构资金-提现")
-//public class PayTestController {
-//
-//    @Autowired
-//    SettleService settleService;
-//
-//    @Autowired
-//    ChinaumsSenselessPayService chinaumsSenselessPayService;
-//
-//    @Autowired
-//    TransactionLogService transactionLogService;
-//
-//    @PostMapping("settle")
-//    public Object settle(){
-//        return settleService.settle("665fc0ef9083d203896d3549", "67061bea18e3af0f903b067a", 1732997367300L, "remark", PaymentType.UnionFrictionlessPay);
-//    }
-//
-//        @PostMapping("queryRefund")
-//    public Object queryRefund(){
-//        return chinaumsSenselessPayService.refundQuery("665fc0ef9083d203896d3549","665fc0389083d203896d3541", "67061bea18e3af0f903b067a", "RE202411191422450130001", false);
-//    }
-//
-//    @PostMapping("groupClean")
-//    public Object groupClean(@RequestBody List<String> generalLedgerId){
-//        return transactionLogService.groupClean(generalLedgerId);
-//    }
-//}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/attendance/LeaveService.java

@@ -179,6 +179,9 @@ public class LeaveService extends SuperService {
             startTime = DateUtils.getSixMonthsAgo();
         }
 
+        if (StringUtils.isBlank(param.getSceneId())){
+            return ResultContent.buildFail("sceneId不能为空");
+        }
         String userId = authHelper.getCurrentUser().getUserId();
         Page<LeaveApproval> page = leaveApprovalDao.page(pageable, param.getLeaveQueryType(), projectId, param.getSceneId(), userId, startTime, param.getEndTime(), param.getLeaveType(), param.getLeaveStatus(), param.getApprovalUserName(), param.getLeaveUserName(), param.getLeaveUserPhone(), param.getApprovalStartTime(), param.getApprovalEndTime());
         return ResultContent.buildContent(PageEntityUtil.concurrent2PageModel(page, this::toModel));