From ad31fa93abe524baec2216f9b2f203acb8cc2d6a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 29 七月 2024 11:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index c91c0e6..4ffd0d0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -20,6 +20,7 @@
import com.ycl.system.mapper.SysRoleMapper;
import com.ycl.system.mapper.SysUserMapper;
import com.ycl.system.mapper.SysUserRoleMapper;
+import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
import com.ycl.platform.service.YwUnitService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -211,6 +212,33 @@
}
@Override
+ public Result workList() {
+ List<YwUnitVO> entities = baseMapper.workList();
+ return Result.ok().data(entities);
+ }
+
+ @Override
+ public void setUnitInfo(LoginUser loginUser) {
+ // 鍗曚綅绠＄悊鍛樻煡璇�
+ YwUnit unit = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(YwUnit::getUnitAdminAccount, loginUser.getUsername())
+ .one();
+ if (Objects.nonNull(unit)) {
+ loginUser.setUnitAdmin(Boolean.TRUE);
+ loginUser.setUnitId(unit.getId());
+ } else {
+ unit = baseMapper.getByUserId(loginUser.getUserId());
+ if (Objects.nonNull(unit)) {
+ loginUser.setUnitAdmin(Boolean.FALSE);
+ loginUser.setUnitId(unit.getId());
+ }
+ else {
+ loginUser.setUnitAdmin(Boolean.FALSE);
+ }
+ }
+ }
+
+ @Override
public List<YwUnitVO> export(YwUnitQuery query) {
// 鍒嗛〉鏉′欢鏌ヨ浣�
IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
--
Gitblit v1.8.0