From 25753634bd80ab6816a982fc54acfbe0f0599738 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 22 Jan 2024 09:06:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5):=2081?=
 =?UTF-8?q?044?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml | 4 +++-
 .../service/impl/EnterpriseStandardInspectServiceImpl.java    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
index 0baa3d76..ade6e263 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
@@ -197,11 +197,13 @@
                      actual_inspect_user,
                      inspect_status,
                      group_concat(lesio.plan_inspect_object separator ',')                  plan_inspect_object,
-                     (IF(lesid.id IS NOT NULL, TRUE, FALSE))                                delay_flag
+                     (IF(lesid.id IS NOT NULL, TRUE, FALSE))                                delay_flag,
+                     realname
               from laws_enterprise_standard_inspect lesi
                        left join laws_enterprise_standard les on lesi.inspect_no = les.standard_number and les.del_flag = '0'
                        left join laws_enterprise_standard_inspect_object lesio on lesi.id = lesio.inspect_id
                        left join laws_enterprise_standard_inspect_delay lesid on lesi.id = lesid.inspect_id
+                       left join sys_user u on lesi.inspect_user = u.id
               group by lesi.id) t
             ${ew.customSqlSegment}
     </sql>
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
index f8936354..e0c4242a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
@@ -398,7 +398,7 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
         queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getBelongDept()), "belong_dept", enterpriseStandardInspectVo.getBelongDept());
         queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectNo()), "inspect_no", enterpriseStandardInspectVo.getInspectNo());
         queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectName()), "inspect_name", enterpriseStandardInspectVo.getInspectName());
-        queryWrapper.eq(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectUser()), "inspect_user", enterpriseStandardInspectVo.getInspectUser());
+        queryWrapper.like(StringUtils.isNotBlank(enterpriseStandardInspectVo.getInspectUser()), "realname", enterpriseStandardInspectVo.getInspectUser());
         queryWrapper.orderByDesc("create_time");
         return queryWrapper;
     }