From 490c159fb94aa1b3f7514ac8d9fb1e24ef11fe06 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 21 八月 2025 20:43:42 +0800
Subject: [PATCH] 勤哲修改接口增加

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java
index 3ec3f9a..067bec7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java
@@ -1,15 +1,25 @@
 package org.springblade.mdm.basesetting.producedivision.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.producedivision.entity.MdmRole;
 import org.springblade.mdm.basesetting.producedivision.entity.MdmUser;
 import org.springblade.mdm.basesetting.producedivision.mapper.MdmUserMapper;
+import org.springblade.mdm.commons.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 @Service
 public class MdmUserService extends ServiceImpl<MdmUserMapper, MdmUser> {
-
+	@Autowired
+	private ParamService paramService;
+	@Autowired
+	private MdmRoleService roleService;
 	public Long getUserIdByName(String name) {
 		List<MdmUser> users = this.lambdaQuery().eq(MdmUser::getName, name).eq(MdmUser::getStatus, 1).orderByDesc(MdmUser::getCreateTime).list();
 		Long userId = null;
@@ -19,4 +29,30 @@
 
 		return userId;
 	}
+
+	public List<MdmUser> listByDeptAndRoleAlias() {
+		List<String> approveRoleAliasList = Func.split(paramService.getApproveRoleAlias(),',');
+		List<MdmUser> approveUserList = userListByRoleAlias(approveRoleAliasList);
+
+		//鏌ヨ绋嬪簭绠$悊鍛樼敤鎴峰垪琛�
+		List<String> managerAliasList = Func.split(paramService.getProgramManagerRoleAlias(),',');
+		List<MdmUser> mgrUserList = userListByRoleAlias(managerAliasList);
+
+		for(MdmUser approveUser : approveUserList) {
+			for(MdmUser manager : mgrUserList) {
+				if(approveUser.getId().equals(manager.getId())) {
+					approveUser.setManager(true);
+					break;
+				}
+			}
+		}
+		return approveUserList;
+	}
+
+	private List<MdmUser> userListByRoleAlias(List<String> approveRoleAliasList) {
+		List<MdmRole> approveRoles = roleService.listRoleAlias(approveRoleAliasList);
+		List<MdmUser> userList= this.getBaseMapper().selectByRoleIds(approveRoles.stream().map(MdmRole::getId).map(rid -> rid+"").toList());
+		return userList;
+
+	}
 }

--
Gitblit v1.9.3