From 7dfa67c88cda91e505e6136c324d73bd3aa5fbda Mon Sep 17 00:00:00 2001
From: Yjoioooo <693337446@qq.com>
Date: 星期一, 27 三月 2023 13:58:49 +0800
Subject: [PATCH] fix 遗漏数据验证后return

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index c03be2c..0f852fe 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -1,9 +1,10 @@
 package com.ruoyi.system.service;
 
 import com.ruoyi.common.mybatis.core.page.PageQuery;
-import com.ruoyi.system.domain.SysRole;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.domain.bo.SysRoleBo;
+import com.ruoyi.system.domain.vo.SysRoleVo;
 
 import java.util.List;
 import java.util.Set;
@@ -16,7 +17,7 @@
 public interface ISysRoleService {
 
 
-    TableDataInfo<SysRole> selectPageRoleList(SysRole role, PageQuery pageQuery);
+    TableDataInfo<SysRoleVo> selectPageRoleList(SysRoleBo role, PageQuery pageQuery);
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
@@ -24,7 +25,7 @@
      * @param role 瑙掕壊淇℃伅
      * @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
      */
-    List<SysRole> selectRoleList(SysRole role);
+    List<SysRoleVo> selectRoleList(SysRoleBo role);
 
     /**
      * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鍒楄〃
@@ -32,7 +33,7 @@
      * @param userId 鐢ㄦ埛ID
      * @return 瑙掕壊鍒楄〃
      */
-    List<SysRole> selectRolesByUserId(Long userId);
+    List<SysRoleVo> selectRolesByUserId(Long userId);
 
     /**
      * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鏉冮檺
@@ -47,7 +48,7 @@
      *
      * @return 瑙掕壊鍒楄〃
      */
-    List<SysRole> selectRoleAll();
+    List<SysRoleVo> selectRoleAll();
 
     /**
      * 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
@@ -63,7 +64,7 @@
      * @param roleId 瑙掕壊ID
      * @return 瑙掕壊瀵硅薄淇℃伅
      */
-    SysRole selectRoleById(Long roleId);
+    SysRoleVo selectRoleById(Long roleId);
 
     /**
      * 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
@@ -71,7 +72,7 @@
      * @param role 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    String checkRoleNameUnique(SysRole role);
+    boolean checkRoleNameUnique(SysRoleBo role);
 
     /**
      * 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
@@ -79,14 +80,14 @@
      * @param role 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    String checkRoleKeyUnique(SysRole role);
+    boolean checkRoleKeyUnique(SysRoleBo role);
 
     /**
      * 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔
      *
-     * @param role 瑙掕壊淇℃伅
+     * @param roleId 瑙掕壊ID
      */
-    void checkRoleAllowed(SysRole role);
+    void checkRoleAllowed(Long roleId);
 
     /**
      * 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄�
@@ -106,34 +107,35 @@
     /**
      * 鏂板淇濆瓨瑙掕壊淇℃伅
      *
-     * @param role 瑙掕壊淇℃伅
+     * @param bo 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    int insertRole(SysRole role);
+    int insertRole(SysRoleBo bo);
 
     /**
      * 淇敼淇濆瓨瑙掕壊淇℃伅
      *
-     * @param role 瑙掕壊淇℃伅
+     * @param bo 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    int updateRole(SysRole role);
+    int updateRole(SysRoleBo bo);
 
     /**
      * 淇敼瑙掕壊鐘舵��
      *
-     * @param role 瑙掕壊淇℃伅
+     * @param roleId 瑙掕壊ID
+     * @param status 瑙掕壊鐘舵��
      * @return 缁撴灉
      */
-    int updateRoleStatus(SysRole role);
+    int updateRoleStatus(Long roleId, String status);
 
     /**
      * 淇敼鏁版嵁鏉冮檺淇℃伅
      *
-     * @param role 瑙掕壊淇℃伅
+     * @param bo 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    int authDataScope(SysRole role);
+    int authDataScope(SysRoleBo bo);
 
     /**
      * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊

--
Gitblit v1.9.3