From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java | 12 +++++++++---
1 files changed, 9 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..ddc4f59 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/DepartmentExtServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import doumeemes.config.shiro.ShiroToken;
import doumeemes.core.constants.ResponseStatus;
import doumeemes.core.exception.BusinessException;
import doumeemes.core.model.LoginUserInfo;
@@ -30,6 +31,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -37,6 +39,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 +256,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
@@ -293,6 +296,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紒鍙兘鍒囨崲鍒板叕鍙哥骇閮ㄩ棬锛�");
}
user.setCurComDepartment(d);
+ //鏇存柊浼氳瘽鏁版嵁淇℃伅
+ SecurityUtils.getSubject().login(new ShiroToken(user,1));
}
}
@@ -443,6 +448,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 +802,7 @@
for (Department department:departmentList ) {
this.dealDepartmentData(department,user);
}
- }
+ }
}
public void dealDepartmentData(Department department,LoginUserInfo user){
--
Gitblit v1.9.3