From 0fce55584de7833aa3c9799fbabda937879a6362 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 10 十二月 2024 16:30:30 +0800
Subject: [PATCH] 医废管理
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
index a1a5eed..ce7095b 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
@@ -29,6 +29,7 @@
import com.sinata.system.service.SysUserDepartmentService;
import lombok.RequiredArgsConstructor;
import org.jetbrains.annotations.NotNull;
+import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -52,7 +53,7 @@
* @since 2024-12-02
*/
@Service
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class SysDepartmentServiceImpl extends ServiceImpl<SysDepartmentMapper, SysDepartment> implements SysDepartmentService {
private final SysUserDepartmentService sysUserDepartmentService;
private final RedisTemplate<Object, Object> redisTemplate;
@@ -365,9 +366,10 @@
String treeCode = "";
if (Objects.isNull(query.getDepartmentId())) {
SysDepartment myDepartment = getMyDepartment();
- if (Objects.nonNull(myDepartment)) {
- treeCode = myDepartment.getTreeCode();
+ if (Objects.isNull(myDepartment)) {
+ return PageDTO.empty(0L, 0L);
}
+ treeCode = myDepartment.getTreeCode();
}
Page<MedicalInstitutionVO> page = baseMapper.pageMedicalList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getDepartmentId(), query.getDepartmentName(), query.getContactPerson(), query.getContactPhone(), treeCode);
return PageDTO.of(page);
@@ -525,9 +527,10 @@
String treeCode = "";
if (Objects.isNull(query.getDepartmentId())) {
SysDepartment myDepartment = getMyDepartment();
- if (Objects.nonNull(myDepartment)) {
- treeCode = myDepartment.getTreeCode();
+ if (Objects.isNull(myDepartment)) {
+ return PageDTO.empty(0L, 0L);
}
+ treeCode = myDepartment.getTreeCode();
}
Page<DisposalUnitVO> page = baseMapper.pageRegulatoryUnitList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getDepartmentId(), query.getDepartmentName(), query.getContactPerson(), query.getContactPhone(), treeCode);
return PageDTO.of(page);
@@ -650,9 +653,10 @@
String treeCode = "";
if (Objects.isNull(query.getDepartmentId())) {
SysDepartment myDepartment = getMyDepartment();
- if (Objects.nonNull(myDepartment)) {
- treeCode = myDepartment.getTreeCode();
+ if (Objects.isNull(myDepartment)) {
+ return PageDTO.empty(0L, 0L);
}
+ treeCode = myDepartment.getTreeCode();
}
Page<SysDepartment> page = this.lambdaQuery().eq(Objects.nonNull(query.getDepartmentId()), SysDepartment::getParentId, query.getDepartmentId())
.likeRight(StringUtils.isNotBlank(treeCode), SysDepartment::getTreeCode, treeCode)
--
Gitblit v1.7.1