From c15739adf58aa87002516f151d6314b8caecbb29 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 30 九月 2022 12:39:47 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/RoleController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/RoleController.java b/src/main/java/com/lf/server/controller/data/RoleController.java
index a181f9e..0bf7a15 100644
--- a/src/main/java/com/lf/server/controller/data/RoleController.java
+++ b/src/main/java/com/lf/server/controller/data/RoleController.java
@@ -43,16 +43,17 @@
     @ApiOperation(value = "鍒嗛〉鏌ヨ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_role"),
+            @ApiImplicitParam(name = "depName", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_role"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPage")
-    public ResponseMsg<List<RoleEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<RoleEntity>> selectByPage(String name,String depName, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
-            List<RoleEntity> rs = roleService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+            List<RoleEntity> rs = roleService.selectByPage(name,depName, pageSize, pageSize * (pageIndex - 1));
             return success(rs);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
@@ -62,11 +63,12 @@
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "1"),
+            @ApiImplicitParam(name = "depName", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_role"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPageAndCount")
-    public ResponseMsg<List<RoleEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<RoleEntity>> selectByPageAndCount(String name,String depName, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -77,7 +79,7 @@
                 return success(0, null);
             }
 
-            List<RoleEntity> rs = roleService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+            List<RoleEntity> rs = roleService.selectByPage(name,depName, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -90,7 +92,7 @@
             @ApiImplicitParam(name = "roleEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.RoleEntity", paramType = "body", example = "")
     })
     @PostMapping(value = "/insertRole", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> insertRole(RoleEntity roleEntity) {
+    public ResponseMsg<Integer> insertRole(@RequestBody RoleEntity roleEntity) {
         try {
             int count = roleService.insertRole(roleEntity);
 
@@ -153,7 +155,7 @@
     })
     @ResponseBody
     @PostMapping(value = "/updateRole", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> updateRole(RoleEntity roleEntity) {
+    public ResponseMsg<Integer> updateRole(@RequestBody RoleEntity roleEntity) {
         try {
             int count = roleService.updateRole(roleEntity);
 

--
Gitblit v1.9.3