From 2d513a9f0e1ebb83e529973e9e79befdaea7d740 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 六月 2024 13:55:05 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/resources/mappers/SystemPermissionMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/resources/mappers/SystemPermissionMapper.xml b/server/service/src/main/resources/mappers/SystemPermissionMapper.xml
index ba0de90..5fe7f06 100644
--- a/server/service/src/main/resources/mappers/SystemPermissionMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemPermissionMapper.xml
@@ -16,7 +16,7 @@
</resultMap>
<select id="selectManageList" resultMap="SystemPermissionListVO">
SELECT
- perm.`ID`, perm.`type`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`FIXED`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`,
+ perm.*,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
FROM SYSTEM_PERMISSION perm
@@ -40,7 +40,7 @@
<!-- 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 -->
<select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPermission">
SELECT
- perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`
+ perm.*
FROM SYSTEM_PERMISSION perm
INNER JOIN SYSTEM_ROLE_PERMISSION role_perm ON role_perm.PERMISSION_ID = perm.ID AND role_perm.DELETED = 0
INNER JOIN SYSTEM_ROLE role ON role.ID = role_perm.ROLE_ID AND role.DELETED = 0
@@ -54,7 +54,7 @@
<!-- 鏍规嵁瑙掕壊ID鏌ヨ鏉冮檺 -->
<select id="selectByRoleId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPermission">
SELECT
- perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`
+ perm.*
FROM SYSTEM_PERMISSION perm
INNER JOIN SYSTEM_ROLE_PERMISSION role_perm ON role_perm.PERMISSION_ID = perm.ID AND role_perm.DELETED = 0
<where>
--
Gitblit v1.9.3