角色列表返回类型保持一致

RuoYi

2021-10-15 a8eba6949eb6d120a7956e99bdbab3bb47c6f03f

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -15,7 +15,6 @@
      <result property="deptName"       column="dept_name"      />

      <result property="operUrl"        column="oper_url"       />

      <result property="operIp"         column="oper_ip"        />

      <result property="operLocation"   column="oper_location"  />

      <result property="operParam"      column="oper_param"     />

      <result property="jsonResult"     column="json_result"    />

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

@@ -24,13 +23,13 @@
   </resultMap>



   <sql id="selectOperLogVo">

        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time

        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time

        from sys_oper_log

    </sql>

    

   <insert id="insertOperlog" parameterType="SysOperLog">

      insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)

        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())

      insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time)

        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())

   </insert>

   

   <select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">

@@ -54,11 +53,11 @@
         <if test="operName != null and operName != ''">

            AND oper_name like concat('%', #{operName}, '%')

         </if>

         <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->

            and date_format(oper_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')

         <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->

            and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')

         </if>

         <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->

            and date_format(oper_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')

         <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->

            and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')

         </if>

      </where>

      order by oper_id desc