解决日志模块不能显示用户信息的bug

src/main/resources/mapper_xml/LogMapperEx.xml

@@ -1,32 +1,37 @@
 <?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.jsh.erp.datasource.mappers.LogMapper">
-    <select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="BaseResultMap">
-        select *
-        FROM jsh_log
+    <resultMap extends="BaseResultMap" id="ResultExMap" type="com.jsh.erp.datasource.vo.LogVo4List">
+        <result column="userName" jdbcType="VARCHAR" property="username" />
+    </resultMap>
+
+    <select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap">
+        select l.*,u.username userName
+        FROM jsh_log l left join jsh_user u
+        on l.userID = u.id
         where 1=1
         <if test="operation != null">
-            and operation like '%${operation}%'
+            and l.operation like '%${operation}%'
         </if>
         <if test="usernameID != null">
-            and userID=${usernameID}
+            and l.userID=${usernameID}
         </if>
         <if test="clientIp != null">
-            and clientIp like '%${clientIp}%'
+            and l.clientIp like '%${clientIp}%'
         </if>
         <if test="status != null">
-            and status=${status}
+            and l.status=${status}
         </if>
         <if test="beginTime != null">
-            and createtime &gt;= '%${beginTime}%'
+            and l.createtime &gt;= '%${beginTime}%'
         </if>
         <if test="endTime != null">
-            and createtime &lt;= '%${endTime}%'
+            and l.createtime &lt;= '%${endTime}%'
         </if>
         <if test="contentdetails != null">
-            and contentdetails like '%${contentdetails}%'
+            and l.contentdetails like '%${contentdetails}%'
         </if>
-        order by createtime desc
+        order by l.createtime desc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
         </if>