From d92e70785122a4505396d4b67e66e378f7a51b7d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 30 十月 2024 17:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
index 557cda4..16e89a2 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
@@ -596,30 +596,11 @@
@Override
public boolean saveUsersDept(String[] userOIds, String deptId) throws PLException {
VciBaseUtil.alertNotNull(deptId,"閮ㄩ棬涓婚敭");
-
- //鍏堟煡閲嶅鐞�
- List<String> repeatUserOidList = new ArrayList<>();
- //寰幆杩涜鏌ラ噸锛岄伩鍏峣n澶т簬1000
- WebUtil.switchCollectionForOracleIn(Arrays.asList(userOIds)).stream().forEach(userOId->{
- String sql = "select pluseruid,pldeptuid from pluserdept where pldeptuid = '" + deptId
- + "' and " + "pluseruid in ("+WebUtil.toInSql(userOId.toArray(new String[0]))+")";
- List<BusinessObject> cbos = boService.queryBySql(sql, null);
- if(!CollectionUtils.isEmpty(cbos)){
- cbos.stream().forEach(cbo->{
- repeatUserOidList.add(ObjectTool.getNewBOAttributeValue(cbo,"pluseruid"));
- });
- }
- });
-
- //浠庡嵆灏嗚鎵ц淇濆瓨鐨勭敤鎴穙id涓Щ闄ゅ綋鍓嶇敤鎴峰凡缁忓瓨鍦ㄥ叧鑱斿叧绯荤殑oid
- //绉婚櫎閲嶅鐨�
- List<String> tempList = new ArrayList<>(Arrays.asList(userOIds));
- tempList.removeAll(repeatUserOidList);
- userOIds = tempList.toArray(new String[tempList.size()]);
- if(Func.isNotEmpty(userOIds)){
- platformClientUtil.getFrameworkService().saveUserDept(userOIds, deptId,new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(),null));
- }
- return true;
+ //涓虹┖鐨勮瘽璇存槑鏄竻绌哄綋鍓嶈繖涓儴闂ㄤ笅鍒嗛厤鐨勬垚鍛�
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ UserEntityInfo userEntityInfo = new UserEntityInfo(sessionInfo.getUserId(), null);
+ boolean resBoolean = platformClientUtil.getFrameworkService().saveRighForDept(deptId, userOIds, userEntityInfo);
+ return resBoolean;
}
/**
--
Gitblit v1.9.3