Merge remote-tracking branch 'origin/master'

src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml

@@ -2,7 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.auth.AuthRoleDao">
-
+    <resultMap type="com.glxp.api.entity.auth.AuthRole" id="SysAuthRoleResult">
+        <result property="roleId" column="role_id"/>
+        <result property="roleName" column="role_name"/>
+    </resultMap>
     <select id="listAdminPage" parameterType="com.glxp.api.req.auth.AuthRoleQueryRequest"
             resultType="com.glxp.api.entity.auth.AuthRole">
         SELECT id,name,status,remark,create_time,listorder,isCustomer
@@ -38,14 +41,14 @@
 
 
     <select id="listCustomerRoles" parameterType="java.lang.Integer"
-            resultType="com.glxp.api.entity.auth.AuthRole">
+            resultMap="SysAuthRoleResult">
         SELECT role_id, role_name
         FROM auth_role
         where `isCustomer` = #{isCustomer}
     </select>
 
     <select id="getCustomerRoles" parameterType="java.lang.Integer"
-            resultType="com.glxp.api.entity.auth.AuthRole">
+            resultMap="SysAuthRoleResult">
         SELECT role_id, role_name
         FROM auth_role
         where `isCustomer` = #{isCustomer}  and status =0
@@ -53,7 +56,7 @@
 
 
     <select id="listAuthRoles2" parameterType="java.lang.Integer" resultType="com.glxp.api.entity.auth.AuthRole">
-        SELECT irole_id, role_name
+        SELECT role_id, role_name
         FROM auth_role
     </select>