From dd7b72d80bb2c4c8b1f6ad1c4ed172d5e00161c3 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 24 Nov 2022 09:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86,=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?,=20=E4=BB=BB=E5=8A=A1=E7=9C=8B=E6=9D=BF=E5=85=B3=E8=81=94IP=20?=
 =?UTF-8?q?2022=E5=B9=B411=E6=9C=8824=E6=97=A5=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/heai/config/MyMetaObjectHandler.java  | 38 +++++++++++++++++++
 .../mapper/taskmanage/TaskDatailDao.xml       |  6 +--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/heai/config/MyMetaObjectHandler.java

diff --git a/src/main/java/com/heai/config/MyMetaObjectHandler.java b/src/main/java/com/heai/config/MyMetaObjectHandler.java
new file mode 100644
index 0000000..b59ae5a
--- /dev/null
+++ b/src/main/java/com/heai/config/MyMetaObjectHandler.java
@@ -0,0 +1,38 @@
+package com.heai.config;
+
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.heai.modules.sys.entity.SysUserEntity;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @Author sxm
+ * @Description 自定义自动填充策略      @TableField(fill = FieldFill.INSERT)
+ * @Date 2022-11-23
+ **/
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+    private Logger logger = LogManager.getLogger(getClass());
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
+        logger.info("start insert fill ....");
+        this.strictInsertFill(metaObject,"createdDate", Date.class, new Date());
+        this.strictInsertFill(metaObject,"site",String.class, user.getSite());
+        this.strictInsertFill(metaObject,"createdBy",String.class, user.getUserDisplay());
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        logger.info("start update fill ....");
+        this.strictUpdateFill(metaObject, "updatedDate", Date.class, new Date());
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
index 3e75830..ed87126 100644
--- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
+++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
@@ -31,13 +31,13 @@
         , tl.updated_by
         , tl.task_header
         , u.username responsible_person
-        ,( td.department + ' | ' +  u.username) as dep_user_name
+        ,( u.department + ' | ' +  u.username) as dep_user_name
         , td.task_id
         from task_detail td
         left join task_list tl on td.task_id = tl.id AND td.site = tl.site
         left join users u on td.site = u.site and u.userId = td.responsible_person
         left join users u2 on td.site = u2.site and u2.userId = tl.task_initiator
-         LEFT JOIN report_mapping_ipaddress  rmi on rmi.department = td.department
+         LEFT JOIN report_mapping_ipaddress  rmi on rmi.department = u.department
         <where>
             td.site = #{site}
             <if test="ipAddress != null and ipAddress != ''">
@@ -47,7 +47,7 @@
                 and tl.created_by like #{taskInitiator}
             </if>
             <if test="department != null and department != ''">
-                and td.department like #{department}
+                and u.department like #{department}
             </if>
             <if test="customer != null and customer != ''">
                 and tl.customer like #{customer}