From d9fefab3306457e1d75bcbae29c91a452f7805e6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 二月 2024 21:19:51 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
index 8f615f5..84dc46c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
@@ -1,10 +1,12 @@
 package com.zy.asrs.wcs.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.asrs.framework.common.Cools;
 import com.zy.asrs.framework.common.R;
 import com.zy.asrs.wcs.common.annotation.OperationLog;
 import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
 import com.zy.asrs.wcs.common.domain.PageParam;
 import com.zy.asrs.wcs.sys.entity.Role;
 import com.zy.asrs.wcs.sys.service.RoleService;
@@ -12,7 +14,9 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,7 +39,7 @@
 
     @PreAuthorize("hasAuthority('sys:role:list')")
     @PostMapping("/role/list")
-    public R list(@RequestBody BaseParam param) {
+    public R list(@RequestBody Map<String, Object> map) {
         return R.ok().add(roleService.list());
     }
 
@@ -94,6 +98,20 @@
     }
 
     @PreAuthorize("hasAuthority('sys:role:list')")
+    @PostMapping("/role/query")
+    public R query(@RequestParam(required = false) String condition) {
+        List<KeyValVo> vos = new ArrayList<>();
+        LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
+        if (!Cools.isEmpty(condition)) {
+            wrapper.like(Role::getName, condition);
+        }
+        roleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+                item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+        );
+        return R.ok().add(vos);
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:list')")
     @PostMapping("/role/export")
     public R export(@RequestBody Role role) {
         return R.ok("瀵煎嚭鎴愬姛");

--
Gitblit v1.9.1