role info add roletype

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/RoleManageServiceImpl.java

@@ -27,7 +27,7 @@ public class RoleManageServiceImpl implements RoleManageService {
         SystemRole systemRole = new SystemRole();
         systemRole.setRoleName(roleReqVo.getRoleName());
         systemRole.setRemark(roleReqVo.getMark());
-        systemRole.setManage(null == roleReqVo.getManage() ? 0 : roleReqVo.getManage());
+        systemRole.setRoleType(null == roleReqVo.getManage() ? 0 : roleReqVo.getManage());
         systemRoleService.save(systemRole);
 
         return systemRole.getId();
@@ -47,7 +47,7 @@ public class RoleManageServiceImpl implements RoleManageService {
 
         dbSystemRole.setRoleName(roleReqVo.getRoleName());
         dbSystemRole.setRemark(roleReqVo.getMark());
-        dbSystemRole.setManage(null == roleReqVo.getManage() ? 0 : roleReqVo.getManage());
+        dbSystemRole.setRoleType(null == roleReqVo.getManage() ? 0 : roleReqVo.getManage());
 
         systemRoleService.updateById(dbSystemRole);
     }

know_sub_model/src/main/java/com/supervision/knowsub/dto/role/UserRoleDTO.java

@@ -10,4 +10,6 @@ public class UserRoleDTO {
     private String roleId;
 
     private String roleName;
+
+    private String roleType;
 }

know_sub_model/src/main/java/com/supervision/knowsub/model/SystemRole.java

@@ -32,7 +32,7 @@ public class SystemRole implements Serializable {
     /**
      * 是否是管理员角色 0否 1是
      */
-    private Integer manage;
+    private Integer roleType;
 
     /**
      * 创建人ID

know_sub_model/src/main/resources/mapper/SystemRoleMapper.xml

@@ -8,7 +8,7 @@
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="roleName" column="role_name" jdbcType="VARCHAR"/>
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
-            <result property="manage" column="manage" jdbcType="INTEGER"/>
+            <result property="roleType" column="role_type" jdbcType="INTEGER"/>
             <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -17,7 +17,7 @@
 
     <sql id="Base_Column_List">
         id,role_name,remark,
-        manage,create_user_id,create_time,
+        role_type,create_user_id,create_time,
         update_user_id,update_time
     </sql>
 </mapper>

know_sub_model/src/main/resources/mapper/SystemUserRoleRelationMapper.xml

@@ -22,7 +22,8 @@
     <select id="listUserRole" resultType="com.supervision.knowsub.dto.role.UserRoleDTO">
         select r.id        as roleId,
                r.role_name as roleName,
-               ur.user_id  as userId
+               ur.user_id  as userId,
+               r.role_type as roleType
         from ks_system_role r
                  left join ks_system_user_role_relation ur on r.id = ur.role_id
         where 1=1
@@ -39,7 +40,8 @@
     <select id="listUserRoleByUserIds" resultType="com.supervision.knowsub.dto.role.UserRoleDTO">
         select r.id        as roleId,
                r.role_name as roleName,
-               ur.user_id  as userId
+               ur.user_id  as userId,
+               r.role_type as roleType
         from ks_system_role r
                  left join ks_system_user_role_relation ur on r.id = ur.role_id
         where ur.user_id in