From c635d78b479510ebe2556a420948effcd30a0731 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 十二月 2024 18:40:43 +0800
Subject: [PATCH] 新建德森项目分支

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/RoleController.java |  282 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/RoleController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/RoleController.java
index 4172008..55cc8bc 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/RoleController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/RoleController.java
@@ -1,141 +1,141 @@
-package com.zy.asrs.common.sys.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.sys.entity.Role;
-import com.zy.asrs.common.sys.service.RoleService;
-import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.*;
-
-@RestController
-public class RoleController extends BaseController {
-
-    @Autowired
-    private RoleService roleService;
-
-    @RequestMapping(value = "/role/{id}/auth")
-    @ManagerAuth
-    public R get(@PathVariable("id") Long id) {
-        return R.ok(roleService.getById(String.valueOf(id)));
-    }
-
-    @RequestMapping(value = "/role/list/auth")
-    @ManagerAuth
-    public R list(@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){
-        LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
-        wrapper.orderByDesc(Role::getId);
-
-        if (9527 == getUserId()) {
-            return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
-        }
-        Long roleId = getUser().getRoleId();
-        Role role = roleService.getById(roleId);
-        Long leaderId = role.getLeader();
-        if (null != leaderId) {
-            List<Long> leaderIds = new ArrayList<>();
-            leaderIds.add(roleId);
-            while (leaderId != null) {
-                Role leader = roleService.getById(leaderId);
-                leaderIds.add(leader.getId());
-                leaderId = leader.getLeader();
-            }
-            wrapper.notIn(Role::getId, leaderIds);
-        }
-//        if (null != role.getLevel()) {
-//            wrapper.gt("level", role.getLevel());
-//        }
-        return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
-    }
-
-
-    @RequestMapping(value = "/role/edit/auth")
-    @ManagerAuth(memo = "瑙掕壊缂栬緫")
-    public R edit(Role role) {
-        if (Cools.isEmpty(role)){
-            return R.error();
-        }
-        if (null == role.getId()){
-            roleService.save(role);
-        } else {
-            roleService.updateById(role);
-        }
-        return R.ok();
-    }
-
-    @RequestMapping(value = "/role/add/auth")
-    @ManagerAuth(memo = "瑙掕壊娣诲姞")
-    public R add(Role role) {
-        roleService.save(role);
-        return R.ok();
-    }
-
-	@RequestMapping(value = "/role/update/auth")
-    @ManagerAuth(memo = "瑙掕壊淇敼")
-    public R update(Role role){
-        if (Cools.isEmpty(role) || null==role.getId()){
-            return R.error();
-        }
-        roleService.updateById(role);
-        return R.ok();
-    }
-
-    @RequestMapping(value = "/role/delete/auth")
-    @ManagerAuth(memo = "瑙掕壊鍒犻櫎")
-    public R delete(Integer[] ids){
-        if (Cools.isEmpty(ids)){
-            return R.error();
-        }
-        roleService.removeByIds(Arrays.asList(ids));
-        return R.ok();
-    }
-
-
-    @RequestMapping(value = "/roleQuery/auth")
-    @ManagerAuth
-    public R query(String condition) {
-        LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(Role::getName, condition);
-        // 涓婁笅绾х鐞�
-        if (9527 != getUserId()) {
-            Long roleId = getUser().getRoleId();
-            Role role = roleService.getById(roleId);
-            Long leaderId = role.getLeader();
-            if (null != leaderId) {
-                List<Long> leaderIds = new ArrayList<>();
-                while (leaderId != null) {
-                    Role leader = roleService.getById(leaderId);
-                    leaderIds.add(leader.getId());
-                    leaderId = leader.getLeader();
-                }
-                wrapper.notIn(Role::getId, leaderIds);
-            }
-//            if (null != role.getLevel()) {
-//                wrapper.ge("level", role.getLevel());
-//            }
-        }
-
-        Page<Role> page = roleService.page(new Page<>(0, 10), wrapper);
-        List<Map<String, Object>> result = new ArrayList<>();
-        for (Role role : page.getRecords()){
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", role.getId());
-            map.put("value", role.getName());
-            result.add(map);
-        }
-        return R.ok(result);
-    }
-
-}
+package com.zy.asrs.common.sys.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.sys.entity.Role;
+import com.zy.asrs.common.sys.service.RoleService;
+import com.zy.asrs.common.web.BaseController;
+import com.zy.asrs.framework.annotations.ManagerAuth;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+public class RoleController extends BaseController {
+
+    @Autowired
+    private RoleService roleService;
+
+    @RequestMapping(value = "/role/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") Long id) {
+        return R.ok(roleService.getById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/role/list/auth")
+    @ManagerAuth
+    public R list(@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){
+        LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByDesc(Role::getId);
+
+        if (9527 == getUserId()) {
+            return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
+        }
+        Long roleId = getUser().getRoleId();
+        Role role = roleService.getById(roleId);
+        Long leaderId = role.getLeader();
+        if (null != leaderId) {
+            List<Long> leaderIds = new ArrayList<>();
+            leaderIds.add(roleId);
+            while (leaderId != null) {
+                Role leader = roleService.getById(leaderId);
+                leaderIds.add(leader.getId());
+                leaderId = leader.getLeader();
+            }
+            wrapper.notIn(Role::getId, leaderIds);
+        }
+//        if (null != role.getLevel()) {
+//            wrapper.gt("level", role.getLevel());
+//        }
+        return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
+    }
+
+
+    @RequestMapping(value = "/role/edit/auth")
+    @ManagerAuth(memo = "瑙掕壊缂栬緫")
+    public R edit(Role role) {
+        if (Cools.isEmpty(role)){
+            return R.error();
+        }
+        if (null == role.getId()){
+            roleService.save(role);
+        } else {
+            roleService.updateById(role);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/role/add/auth")
+    @ManagerAuth(memo = "瑙掕壊娣诲姞")
+    public R add(Role role) {
+        roleService.save(role);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/role/update/auth")
+    @ManagerAuth(memo = "瑙掕壊淇敼")
+    public R update(Role role){
+        if (Cools.isEmpty(role) || null==role.getId()){
+            return R.error();
+        }
+        roleService.updateById(role);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/role/delete/auth")
+    @ManagerAuth(memo = "瑙掕壊鍒犻櫎")
+    public R delete(Integer[] ids){
+        if (Cools.isEmpty(ids)){
+            return R.error();
+        }
+        roleService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+
+    @RequestMapping(value = "/roleQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(Role::getName, condition);
+        // 涓婁笅绾х鐞�
+        if (9527 != getUserId()) {
+            Long roleId = getUser().getRoleId();
+            Role role = roleService.getById(roleId);
+            Long leaderId = role.getLeader();
+            if (null != leaderId) {
+                List<Long> leaderIds = new ArrayList<>();
+                while (leaderId != null) {
+                    Role leader = roleService.getById(leaderId);
+                    leaderIds.add(leader.getId());
+                    leaderId = leader.getLeader();
+                }
+                wrapper.notIn(Role::getId, leaderIds);
+            }
+//            if (null != role.getLevel()) {
+//                wrapper.ge("level", role.getLevel());
+//            }
+        }
+
+        Page<Role> page = roleService.page(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Role role : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", role.getId());
+            map.put("value", role.getName());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+}

--
Gitblit v1.9.1