From 80e15fea89e48b93626c5b5464b156dc580167b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 17 二月 2023 14:54:32 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   36 ++++++++++++++++--------------------
 1 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index dab29f1..5271686 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -234,14 +234,28 @@
     @ApiOperation(value = "鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ琛�")
     @GetMapping(value = "/selectTabsByPage")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+            @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
             @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
-    public ResponseMsg<List<TabEntity>> selectTabsByPage(String tab, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<TabEntity>> selectTabsByPage(String depcode, String dirs, String tab, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+            }
+            if (StringHelper.isSqlInjection(depcode)) {
+                return fail("鍗曚綅浠g爜鍚湁闈炴硶瀛楃", null);
+            }
+
+            String filters = "1=1";
+            if (!StringHelper.isEmpty(depcode)) {
+                filters += String.format(" and depid like '%s%%'", depcode);
+            }
+            dirs = DataLibService.copeCodes(dirs, "dirid");
+            if (dirs != null) {
+                filters += String.format(" and (%s)", dirs);
             }
 
             int count = baseQueryService.selectTabsForCount(tab);
@@ -249,7 +263,7 @@
                 return success(0, null);
             }
 
-            List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, pageSize, pageSize * (pageIndex - 1));
+            List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, filters, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -548,24 +562,6 @@
     public ResponseMsg<Object> selectProject() {
         try {
             List<KeyValueEntity> list = baseQueryService.selectProject();
-
-            return success(list);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ瀛楀吀琛ㄥ苟缁熻璁板綍")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
-            @ApiImplicitParam(name = "dirs", value = "鐩綍ID", dataType = "String", paramType = "query", example = "2,5,309"),
-            @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1")
-    })
-    @GetMapping(value = "/selectTabCount")
-    public ResponseMsg<Object> selectTabCount(String name, String dirs, Integer depid) {
-        try {
-            List<DictEntity> list = baseQueryService.selectTabCount(name, dirs, depid);
 
             return success(list);
         } catch (Exception ex) {

--
Gitblit v1.9.3