From 100079be55493c439bfef2d4792bfa0d9f429bd1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 十月 2024 15:14:43 +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 | 9 +++++----
1 files changed, 5 insertions(+), 4 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..557cda4 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,9 +594,10 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
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->{
@@ -924,7 +925,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