升级oshi到最新版本v5.2.5

RuoYi

2020-09-22 47793b7c905f2bcdf8c2034d82a5415722c89a8f

 src/main/resources/mybatis/system/SysRoleMapper.xml

@@ -5,22 +5,24 @@
<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMapper">



   <resultMap type="SysRole" id="SysRoleResult">

      <id     property="roleId"       column="role_id"        />

      <result property="roleName"     column="role_name"      />

      <result property="roleKey"      column="role_key"       />

      <result property="roleSort"     column="role_sort"      />

      <result property="dataScope"    column="data_scope"     />

      <result property="status"       column="status"         />

      <result property="delFlag"      column="del_flag"       />

      <result property="createBy"     column="create_by"      />

      <result property="createTime"   column="create_time"    />

      <result property="updateBy"     column="update_by"      />

      <result property="updateTime"   column="update_time"    />

      <result property="remark"       column="remark"         />

      <id     property="roleId"             column="role_id"               />

      <result property="roleName"           column="role_name"             />

      <result property="roleKey"            column="role_key"              />

      <result property="roleSort"           column="role_sort"             />

      <result property="dataScope"          column="data_scope"            />

      <result property="menuCheckStrictly"  column="menu_check_strictly"   />

      <result property="deptCheckStrictly"  column="dept_check_strictly"   />

      <result property="status"             column="status"                />

      <result property="delFlag"            column="del_flag"              />

      <result property="createBy"           column="create_by"             />

      <result property="createTime"         column="create_time"           />

      <result property="updateBy"           column="update_by"             />

      <result property="updateTime"         column="update_time"           />

      <result property="remark"             column="remark"                />

   </resultMap>

   

   <sql id="selectRoleVo">

       select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope,

       select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,

            r.status, r.del_flag, r.create_time, r.remark 

        from sys_role r

           left join sys_user_role ur on ur.role_id = r.role_id

@@ -95,6 +97,8 @@
          <if test="roleKey != null and roleKey != ''">role_key,</if>

          <if test="roleSort != null and roleSort != ''">role_sort,</if>

          <if test="dataScope != null and dataScope != ''">data_scope,</if>

          <if test="menuCheckStrictly != null">menu_check_strictly,</if>

          <if test="deptCheckStrictly != null">dept_check_strictly,</if>

          <if test="status != null and status != ''">status,</if>

          <if test="remark != null and remark != ''">remark,</if>

          <if test="createBy != null and createBy != ''">create_by,</if>

@@ -105,6 +109,8 @@
          <if test="roleKey != null and roleKey != ''">#{roleKey},</if>

          <if test="roleSort != null and roleSort != ''">#{roleSort},</if>

          <if test="dataScope != null and dataScope != ''">#{dataScope},</if>

          <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>

          <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>

          <if test="status != null and status != ''">#{status},</if>

          <if test="remark != null and remark != ''">#{remark},</if>

          <if test="createBy != null and createBy != ''">#{createBy},</if>

@@ -119,6 +125,8 @@
          <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>

          <if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if>

          <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>

          <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>

          <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>

          <if test="status != null and status != ''">status = #{status},</if>

          <if test="remark != null">remark = #{remark},</if>

          <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>