From 9c5987aa7b8bb8bd70efddcae0f5b3551f902de6 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Mon, 12 Oct 2020 15:31:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/{PermissionDao.java => RolePermissionMapper.java}   | 2 +-
 .../hrauth/service/impl/RolePermissionServiceImpl.java      | 5 ++---
 .../{PermissionDao.xml => RolePermissionMapper.xml}         | 6 +++---
 .../domain/hrms/response/RolePermissionResponse.java        | 5 +++++
 4 files changed, 11 insertions(+), 7 deletions(-)
 rename dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/{PermissionDao.java => RolePermissionMapper.java} (87%)
 rename dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/{PermissionDao.xml => RolePermissionMapper.xml} (88%)

diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/PermissionDao.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/RolePermissionMapper.java
similarity index 87%
rename from dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/PermissionDao.java
rename to dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/RolePermissionMapper.java
index a531126a..1eb2828c 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/PermissionDao.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/RolePermissionMapper.java
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2020-09-07 16:26:04
  */
 @Mapper
-public interface PermissionDao extends BaseMapper<PermissionEntity> {
+public interface RolePermissionMapper extends BaseMapper<PermissionEntity> {
     IPage<PermissionEntity> pageByCondition(Page page);
 	
 }
diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/RolePermissionServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/RolePermissionServiceImpl.java
index 05adbeb7..424401b1 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/RolePermissionServiceImpl.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/RolePermissionServiceImpl.java
@@ -3,10 +3,9 @@ package com.daqing.financial.hrauth.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.daqing.financial.hrauth.dao.PermissionDao;
+import com.daqing.financial.hrauth.dao.RolePermissionMapper;
 import com.daqing.financial.hrauth.service.RolePermissionService;
 import com.daqing.framework.domain.hrms.PermissionEntity;
-import com.daqing.framework.domain.hrms.SystemLog;
 import com.daqing.framework.utils.PageUtils;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +15,7 @@ import java.util.stream.Collectors;
 
 
 @Service("rolePermissionService")
-public class RolePermissionServiceImpl extends ServiceImpl<PermissionDao, PermissionEntity> implements RolePermissionService {
+public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper, PermissionEntity> implements RolePermissionService {
 
     @Override
     public List<PermissionEntity> listWithTree() {
diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/PermissionDao.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/RolePermissionMapper.xml
similarity index 88%
rename from dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/PermissionDao.xml
rename to dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/RolePermissionMapper.xml
index fb1ecb39..3ead99c3 100644
--- a/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/PermissionDao.xml
+++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/RolePermissionMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.daqing.financial.hrauth.dao.PermissionDao">
+<mapper namespace="com.daqing.financial.hrauth.dao.RolePermissionMapper">
 
     <!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.daqing.framework.domain.hrms.PermissionEntity" id="permissionMap">
@@ -18,8 +18,8 @@
         <result property="createTime" column="create_time"/>
         <result property="motifyTime" column="motify_time"/>
     </resultMap>
-    <select id="pageByCondition" resultType="com.daqing.framework.domain.hrms.PermissionEntity">
-        select hr.`name`,hr.description,GROUP_CONCAT(hp.`name`separator '/')
+    <select id="pageByCondition" resultType="com.daqing.framework.domain.hrms.response.RolePermissionResponse">
+        select hr.`name`,hr.description,GROUP_CONCAT(hp.`name`separator '/') as permissionName
         FROM hrms_role_permission rp
         LEFT JOIN hrms_role hr on hr.id = rp.role_id
         LEFT JOIN hrms_permission hp on hp.id= rp.permission_id
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/RolePermissionResponse.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/RolePermissionResponse.java
index 89fd4d0b..47bca555 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/RolePermissionResponse.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/RolePermissionResponse.java
@@ -23,5 +23,10 @@ import java.util.List;
 public class RolePermissionResponse implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	private String name;
+
+	private String description;
+
+	private String permissionName;
 
 }