From 5acc490fa6f77a9ed7b5976ee6a2e22b070df5bf Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 七月 2024 09:49:36 +0800
Subject: [PATCH] 角色管理联调修改、部门管理接口等代码上传

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
index fa9b95d..4374a0a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
@@ -567,7 +567,7 @@
 	}
 
 	/**
-	 * 淇濆瓨鐢ㄦ埛瑙掕壊鍏宠仈鍏崇郴
+	 * 鎴愬憳绠$悊鍒嗛厤瑙掕壊璋冪敤锛屼繚瀛樼敤鎴疯鑹插叧鑱斿叧绯�
 	 * @param userOids
 	 * @param roleIds
 	 * @return
@@ -576,7 +576,23 @@
 	public boolean saveRights(String[] userOids, String[] roleIds) throws PLException {
 		VciBaseUtil.alertNotNull(userOids,"鐢ㄦ埛涓婚敭");
 		//roleIds鍏佽涓虹┖锛屼负绌烘椂娓呯┖褰撳墠鐢ㄦ埛鐨勬潈闄�
-		return platformClientUtil.getFrameworkService().saveRights(roleIds,userOids,new UserEntityInfo());
+		UserEntityInfo userEntityInfo = new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(),null);
+		return platformClientUtil.getFrameworkService().saveRights(roleIds,userOids,userEntityInfo);
+	}
+
+	/**
+	 * 瑙掕壊绠$悊鍒嗛厤鎴愬憳鎺ュ彛璋冪敤
+	 * @param userOids
+	 * @param roleId
+	 * @return
+	 * @throws PLException
+	 */
+	@Override
+	public boolean saveRight(String[] userOids, String roleId) throws PLException {
+		VciBaseUtil.alertNotNull(roleId,"瑙掕壊涓婚敭");
+		//roleIds鍏佽涓虹┖锛屼负绌烘椂娓呯┖褰撳墠鐢ㄦ埛鐨勬潈闄�
+		UserEntityInfo userEntityInfo = new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(),null);
+		return platformClientUtil.getFrameworkService().saveRight(roleId,userOids,userEntityInfo);
 	}
 
 	/**
@@ -632,7 +648,7 @@
 				smRoleDTO.getName(),"瑙掕壊鍚�");
 		//鏌ヨ鏁版嵁搴撲腑鐨勶紝鏍规嵁瑙掕壊鍚嶆煡
 		Map<String, String> conditionMap = new HashMap<>();
-		conditionMap.put("pluid",smRoleDTO.getOid());
+		conditionMap.put("plname",smRoleDTO.getName());
 		SmRoleVO dbSmRoleVO = getRoleByConditionMap(conditionMap);
 		//鏍规嵁涓婚敭娌℃煡璇㈠埌浜嗙敤鎴�
 		if(Func.isEmpty(dbSmRoleVO) || Func.isBlank(dbSmRoleVO.getOid())){

--
Gitblit v1.9.3