From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java
index d918101..c92dcba 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java
@@ -37,6 +37,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import javax.annotation.PostConstruct;
import java.util.*;
import java.util.stream.Collectors;
@@ -253,8 +254,8 @@
@Override
public Department findOne(Department Department) {
- Wrapper<Department> wrapper = new QueryWrapper<>(Department);
- return departmentExtMapper.selectOne(wrapper);
+ QueryWrapper<Department> wrapper = new QueryWrapper<>(Department);
+ return departmentExtMapper.selectOne(wrapper.last("limit 1"));
}
@Override
@@ -443,6 +444,7 @@
//鍔犲叆redis缂撳瓨锛屽瓨鍌ㄤ紒涓氫俊鎭�
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.COM_DEPART_TREE_KEY+com.getId(),rootDepart);
}
+ @PostConstruct
@Override
public void loadAllDepart() {
QueryCompanyExtDTO dto = new QueryCompanyExtDTO();
@@ -796,7 +798,7 @@
for (Department department:departmentList ) {
this.dealDepartmentData(department,user);
}
- }
+ }
}
public void dealDepartmentData(Department department,LoginUserInfo user){
--
Gitblit v1.9.3