显示操作日志姓名

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java

@@ -43,8 +43,9 @@ public class SysOperLog extends BaseEntity
     private Integer operatorType;
 
     /** 操作人员 */
-    @Excel(name = "操作人员")
     private String operName;
+    @Excel(name = "操作人员")
+    private String nickName;
 
     /** 部门名称 */
     @Excel(name = "部门名称")
@@ -172,6 +173,16 @@ public class SysOperLog extends BaseEntity
         return deptName;
     }
 
+    public String getNickName()
+    {
+        return nickName;
+    }
+
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+
     public void setDeptName(String deptName)
     {
         this.deptName = deptName;

oa-back/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="requestMethod"  column="request_method" />
 		<result property="operatorType"   column="operator_type"  />
 		<result property="operName"       column="oper_name"      />
+		<result property="nickName"       column="nick_name"         />
 		<result property="deptName"       column="dept_name"      />
 		<result property="operUrl"        column="oper_url"       />
 		<result property="operIp"         column="oper_ip"        />
@@ -25,8 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</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, cost_time
-        from sys_oper_log
+        select o.oper_id, o.title, o.business_type, o.method, o.request_method, o.operator_type, o.oper_name, o.dept_name, o.oper_url, o.oper_ip, o.oper_location, o.oper_param, o.json_result, o.status, o.error_msg, o.oper_time, o.cost_time, u.nick_name
+        from sys_oper_log as o
+	 	left join sys_user as u on u.user_name = o.oper_name
     </sql>
     
 	<insert id="insertOperlog" parameterType="SysOperLog">
@@ -38,34 +40,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectOperLogVo"/>
 		<where>
 			<if test="operIp != null and operIp != ''">
-				AND oper_ip like concat('%', #{operIp}, '%')
+				AND o.oper_ip like concat('%', #{operIp}, '%')
 			</if>
 			<if test="title != null and title != ''">
-				AND title like concat('%', #{title}, '%')
+				AND o.title like concat('%', #{title}, '%')
 			</if>
 			<if test="businessType != null">
-				AND business_type = #{businessType}
+				AND o.business_type = #{businessType}
 			</if>
 			<if test="businessTypes != null and businessTypes.length > 0">
-			    AND business_type in
+			    AND o.business_type in
 			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
 		 			#{businessType}
 		        </foreach> 
 			</if>
 			<if test="status != null">
-				AND status = #{status}
+				AND o.status = #{status}
 			</if>
 			<if test="operName != null and operName != ''">
-				AND oper_name like concat('%', #{operName}, '%')
+				AND o.oper_name like concat('%', #{operName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND oper_time &gt;= #{params.beginTime}
+				AND o.oper_time &gt;= #{params.beginTime}
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND oper_time &lt;= #{params.endTime}
+				AND o.oper_time &lt;= #{params.endTime}
 			</if>
 		</where>
-		order by oper_id desc
+		order by o.oper_id desc
 	</select>
 	
 	<delete id="deleteOperLogByIds" parameterType="Long">