From abdd896a66eced1355a24ea5eabbee497a745fe5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 20:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java
index 075741a..8205e50 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentExamineController.java
@@ -8,6 +8,7 @@
import com.mindskip.xzs.domain.vo.DepartmentExamineVO;
import com.mindskip.xzs.service.IDepartmentExamineService;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -29,6 +30,7 @@
@RequestMapping(value = "list", method = RequestMethod.POST)
public RestResponse<PageInfo<DepartmentExamineVO>> list(@RequestBody DepartmentExamineVO departmentExamineVO) {
+ departmentExamineVO.setDeptIds(ObjectUtils.isNotEmpty(departmentExamineVO.getDeptIds()) ? departmentExamineVO.getDeptIds() : getAdminDeptIds());
return RestResponse.ok(departmentExamineService.pageInfo(departmentExamineVO));
}
--
Gitblit v1.8.0