From 2a06a2a8aed92fd2eb4b4570b79f304a1c0caf6d Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 12 九月 2024 09:39:37 +0800
Subject: [PATCH] 1、Action树查询接口增加id。 2、增加角色列表接口

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 cec47dc..cbb2b54 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
@@ -4,6 +4,7 @@
 import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
 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.*;
 import com.vci.starter.web.util.ControllerUtil;
@@ -62,7 +63,7 @@
             e.printStackTrace();
             String exceptionMessage = "閮ㄩ棬鏍戞煡璇㈡椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
             logger.error(exceptionMessage);
-            return BaseResult.fail(e.getMessage());
+            return BaseResult.fail(exceptionMessage);
         }
     }
 
@@ -177,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