From 37d730454255d0680c2bc4f1e15dc5cd1a55e6a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 十月 2024 09:58:36 +0800
Subject: [PATCH] 部门分配成员接口和界面传参修改，枚举修改报错修复提交
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 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 637ca30..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
@@ -70,7 +70,7 @@
/**
* 蹇呭～鍒�
*/
- private ArrayList<Integer> ColumnNameisRed = new ArrayList<Integer>();
+ private List<Integer> ColumnNameisRed = new ArrayList<Integer>();
/**
* 鏃ュ織
@@ -594,31 +594,13 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public boolean saveUsersDept(String[] userOIds, String deptId) throws PLException {
- //鍏堣繘鎬ф煡閲嶅鐞�
- 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;
+ VciBaseUtil.alertNotNull(deptId,"閮ㄩ棬涓婚敭");
+ //涓虹┖鐨勮瘽璇存槑鏄竻绌哄綋鍓嶈繖涓儴闂ㄤ笅鍒嗛厤鐨勬垚鍛�
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ UserEntityInfo userEntityInfo = new UserEntityInfo(sessionInfo.getUserId(), null);
+ boolean resBoolean = platformClientUtil.getFrameworkService().saveRighForDept(deptId, userOIds, userEntityInfo);
+ return resBoolean;
}
/**
@@ -924,7 +906,7 @@
});
}catch (Exception e){
if(logger.isErrorEnabled()){
- logger.error("璇诲彇excel鍐呭鏃舵垨淇濆瓨鐢ㄦ埛淇℃伅鏃跺嚭鐜颁簡閿欒锛屽叿浣撳師鍥狅細",e.getMessage());
+ logger.error("璇诲彇excel鍐呭鏃舵垨淇濆瓨閮ㄩ棬鏃跺嚭鐜颁簡閿欒锛屽叿浣撳師鍥狅細",e.getMessage());
}
e.printStackTrace();
return BaseResult.fail(LangBaseUtil.getErrorMsg(e),new String[]{},e);
--
Gitblit v1.9.3