From d290c28f525eee3da63a95c63a1c42c69d6cdb46 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 21 九月 2022 11:12:30 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/controller/ResourceController.java |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 55be712..b7d3d41 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -41,6 +41,23 @@
         return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
+    @RequestMapping(value = "/resource/tree/auth")
+    @ManagerAuth
+    public R tree(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam Map<String, Object> param){
+        EntityWrapper<Resource> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        else {
+            wrapper.orderBy("sort");
+        }
+        return R.parse("0-鎿嶄綔鎴愬姛").add(resourceService.selectList(wrapper));
+    }
+
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
             String val = String.valueOf(entry.getValue());
@@ -78,7 +95,7 @@
         return R.ok();
     }
 
-	@RequestMapping(value = "/resource/update/auth")
+    @RequestMapping(value = "/resource/update/auth")
     @ManagerAuth(memo = "鑿滃崟淇敼")
     public R update(Resource resource){
         if (Cools.isEmpty(resource) || null==resource.getId()){
@@ -88,13 +105,22 @@
         return R.ok();
     }
 
+//    @RequestMapping(value = "/resource/delete/auth")
+//    @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
+//    public R delete(Integer[] ids){
+//        if (Cools.isEmpty(ids)){
+//            return R.error();
+//        }
+//        resourceService.deleteBatchIds(Arrays.asList(ids));
+//        return R.ok();
+//    }
+
     @RequestMapping(value = "/resource/delete/auth")
-    @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
-    public R delete(Integer[] ids){
-        if (Cools.isEmpty(ids)){
-            return R.error();
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+        for (Long id : ids){
+            resourceService.deleteById(id);
         }
-        resourceService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
     }
 

--
Gitblit v1.9.1