From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
index 08331cd..db10443 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.CustomService;
import com.ruoyi.system.service.UserService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +20,8 @@
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛淇℃伅琛�
@@ -110,5 +113,25 @@
});
return 1;
}
+
+ @Override
+ public Map<String, List<Map<String, Object>>> getLaboratoryPersonList() {
+ //鏌ヨ閫氫俊鍜岀數鍔涗笅鐨勪汉鍛樹俊鎭�
+ //鏌ヨ褰撳墠鐧诲綍浜哄憳鐨勬灦鏋�
+ //鍒ゆ柇鍏ㄩ儴,涓汉,缁勭粐鐨勬潈闄�
+ User user = baseMapper.selectById(SecurityUtils.getUserId());//褰撳墠鐧诲綍鐨勪汉
+ //鑾峰彇褰撳墠浜烘墍灞炲疄楠屽id
+ String laboratory = "";
+ String departLimsId = user.getDepartLimsId();
+ if (ObjectUtils.isNotEmpty(departLimsId)) {
+ String[] split = departLimsId.split(",");
+ //鏌ヨ瀵瑰簲鏋舵瀯鍚嶇О(閫氫俊瀹為獙瀹�,鐢靛姏瀹為獙瀹�,妫�娴嬪姙)
+ String departLims = baseMapper.seldepLimsId(Integer.parseInt(split[split.length - 1]));
+ if (departLims.contains("瀹為獙瀹�")) {
+ laboratory = departLims;
+ }
+ }
+ return baseMapper.getLaboratoryPersonList(laboratory).stream().collect(Collectors.groupingBy(m->m.get("depName").toString()));
+ }
}
--
Gitblit v1.9.3