1550076451 2 gadi atpakaļ
vecāks
revīzija
487a7e2381

+ 2 - 1
zxkf-mapper/src/main/java/api/mapper/system/RoleDeptMapper.java

@@ -3,6 +3,7 @@ package api.mapper.system;
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import api.entity.database.system.RoleDept;
5 5
 import org.apache.ibatis.annotations.Mapper;
6
+import org.springframework.data.repository.query.Param;
6 7
 
7 8
 import java.util.List;
8 9
 
@@ -22,7 +23,7 @@ public interface RoleDeptMapper extends BaseMapper<RoleDept> {
22 23
      * @param roleId 需要删除的数据ID
23 24
      * @return 结果
24 25
      */
25
-    public int deleteRoleDept(Long[] roleId);
26
+    public int deleteRoleDept( Long[] roleId);
26 27
 
27 28
     /**
28 29
      * 查询部门使用数量

+ 2 - 1
zxkf-mapper/src/main/java/api/mapper/system/RoleMenuMapper.java

@@ -3,6 +3,7 @@ package api.mapper.system;
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import api.entity.database.system.RoleMenu;
5 5
 import org.apache.ibatis.annotations.Mapper;
6
+import org.springframework.data.repository.query.Param;
6 7
 
7 8
 import java.util.List;
8 9
 
@@ -30,7 +31,7 @@ public interface RoleMenuMapper extends BaseMapper<RoleMenu> {
30 31
      * @param roleId 需要删除的数据ID
31 32
      * @return 结果
32 33
      */
33
-    public int deleteRoleMenu(Long[] roleId);
34
+    public int deleteRoleMenu( Long[] roleId);
34 35
 
35 36
     /**
36 37
      * 批量新增角色菜单信息

+ 3 - 3
zxkf-mapper/src/main/resources/mapper/system/RoleDeptMapper.xml

@@ -17,10 +17,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
17 17
 	    select count(1) from sys_role_dept where dept_id=#{deptId}
18 18
 	</select>
19 19
 	
20
-	<delete id="deleteRoleDept" parameterType="Long">
20
+	<delete id="deleteRoleDept" >
21 21
  		delete from sys_role_dept where role_id in
22
- 		<foreach collection="array" item="role_id" open="(" separator="," close=")">
23
- 			#{roleId}
22
+ 		<foreach collection="roleId" item="item"  open="(" separator="," close=")">
23
+ 			#{item}
24 24
         </foreach> 
25 25
  	</delete>
26 26
 	

+ 3 - 3
zxkf-mapper/src/main/resources/mapper/system/RoleMenuMapper.xml

@@ -16,10 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
16 16
 		delete from sys_role_menu where role_id=#{roleId}
17 17
 	</delete>
18 18
 
19
-	<delete id="deleteRoleMenu" parameterType="Long">
19
+	<delete id="deleteRoleMenu" >
20 20
 		delete from sys_role_menu where role_id in
21
-		<foreach collection="array" item="roleId" open="(" separator="," close=")">
22
-			#{roleId}
21
+		<foreach collection="roleId" item="item" open="(" separator="," close=")">
22
+			#{item}
23 23
 		</foreach>
24 24
 	</delete>
25 25
 	

+ 8 - 8
zxkf-service/src/main/java/api/service/system/impl/RoleServiceImpl.java

@@ -206,17 +206,17 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
206 206
                 }
207 207
             }
208 208
         }
209
-        // 删除角色与菜单关联
210 209
         int menuResult = roleMenuMapper.deleteRoleMenu(roleIds);
211
-        if (menuResult != 0) {
212
-            return true;
213
-        }
210
+        //  if (menuResult != 0) {
211
+        //     return true;
212
+        // }
214 213
         // 删除角色与部门关联
215 214
         int deptResult = roleDeptMapper.deleteRoleDept(roleIds);
216
-        if (deptResult != 0) {
217
-            return true;
218
-        }
219
-        return false;
215
+        // if (deptResult != 0) {
216
+       //     return true;
217
+       // }
218
+
219
+        return true;
220 220
     }
221 221
 
222 222
     /**