From d2008fc35a45ff00b0f37939a13b792ab12e8c6f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 10:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
index 2b11de4..5b3a1bb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
@@ -1,12 +1,9 @@
package com.vci.frameworkcore.controller;
-import com.vci.corba.common.PLException;
-import com.vci.corba.common.data.UserEntityInfo;
-import com.vci.corba.framework.data.DeptInfo;
+import com.vci.dto.OrgDepartmentDTO;
import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
-import com.vci.frameworkcore.model.dto.OrgDepartmentDTO;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.pagemodel.OrgDepartmentVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
@@ -15,8 +12,6 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.util.Func;
-import com.vci.web.util.PlatformClientUtil;
-import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +63,7 @@
e.printStackTrace();
String exceptionMessage = "閮ㄩ棬鏍戞煡璇㈡椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
logger.error(exceptionMessage);
- return BaseResult.fail(e.getMessage());
+ return BaseResult.fail(exceptionMessage);
}
}
@@ -85,21 +80,21 @@
/**
* 淇濆瓨閮ㄩ棬鐢ㄦ埛鍏宠仈淇℃伅锛屽钩鍙拌嚜甯︽煡閲嶅姛鑳�
- * @param userOids 鐢ㄦ埛id
+ * @param userOIds 鐢ㄦ埛id
* @param deptId 閮ㄩ棬oid
* @return
*/
@RequestMapping(value = "/saveUsersDepts",method = RequestMethod.POST)
- public BaseResult saveUsersDepts(String[] userOids, String deptId){
+ public BaseResult saveUsersDepts(String[] userOIds, String deptId){
//涓嶈兘鍚屾椂涓虹┖
- if(Func.isEmpty(userOids) && Func.isBlank(deptId)){
- return BaseResult.fail("瑙掕壊涓婚敭鍜岄儴闂ㄤ富閿紝鍙傛暟涓嶈兘鍚屾椂涓虹┖!");
+ if(Func.isEmpty(userOIds) && Func.isBlank(deptId)){
+ return BaseResult.fail("鍙傛暟銆愮敤鎴蜂富閿�戝拰銆愰儴闂ㄤ富閿�戯紝涓嶈兘鍚屾椂涓虹┖!");
}
try {
- return deptQueryService.saveUsersDept(userOids,deptId) ? BaseResult.success("閮ㄩ棬鍒嗛厤鎴愬姛锛�"):BaseResult.fail("閮ㄩ棬鍒嗛厤澶辫触锛�");
+ return deptQueryService.saveUsersDept(userOIds,deptId) ? BaseResult.success("閮ㄩ棬鍒嗛厤鎴愬姛锛�"):BaseResult.fail("閮ㄩ棬鍒嗛厤澶辫触锛�");
}catch (Exception e){
e.printStackTrace();
- String exceptionMessage = "鍏宠仈鐨勯儴闂ㄦ椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ String exceptionMessage = "鍏宠仈閮ㄩ棬鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
logger.error(exceptionMessage);
return BaseResult.fail(exceptionMessage);
}
@@ -183,6 +178,7 @@
* @return
*/
@RequestMapping(value = "/importDept",method = RequestMethod.POST)
+ @VciUnCheckRight
public BaseResult importUser(MultipartFile file){
String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
File file1 = new File(excelFileName);
--
Gitblit v1.9.3