From a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Jun 2023 14:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
index f25ea72..9f503c0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
@@ -11,6 +11,7 @@
<result property="reportTime" column="report_time"/>
<result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result property="reportUser" column="real_name"/>
<result property="createDept" column="create_dept"/>
<result property="createUser" column="create_user"/>
@@ -23,8 +24,9 @@
</resultMap>
<select id="selectRecordPage" resultMap="vo">
- SELECT R.*,arb."name" reservoirName FROM SM_MANAGE_PROTECT_RECORD R
+ SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_MANAGE_PROTECT_RECORD R
LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
+ LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER
WHERE R.IS_DELETED = 0
<if test="record.reservoirName != null and record.reservoirName !=''">
AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
--
Gitblit v1.9.3