From 596d1dd3996018d5e31d58987ecaf1320538d3be Mon Sep 17 00:00:00 2001
From: zhulongchuan <1624729110@qq.com>
Date: Mon, 15 Sep 2025 22:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=B8=93=E4=B8=9A=E6=83=85=E5=86=B5=E8=81=94=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/uav/UavOperatorProfessionMapper.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/djhk-system/src/main/resources/mapper/uav/UavOperatorProfessionMapper.xml b/djhk-system/src/main/resources/mapper/uav/UavOperatorProfessionMapper.xml
index 68e9dcc..ccd9a82 100644
--- a/djhk-system/src/main/resources/mapper/uav/UavOperatorProfessionMapper.xml
+++ b/djhk-system/src/main/resources/mapper/uav/UavOperatorProfessionMapper.xml
@@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="type"    column="type"    />
         <result property="annexUrl"    column="annex_url"    />
         <result property="operatorId"    column="operator_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="policeNo"    column="police_no"    />
     </resultMap>
 
 
@@ -34,9 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUavOperatorList" parameterType="com.djhk.uav.uav.model.UavOperatorProfession" resultMap="UavOperatorResult">
         select p.id, p.awards_date,  p.awards_content, p.train_date, p.train_content, p.daily_content, p.daily_month, p.daily_duration,p.total_duration,
         p.type, p.annex_url,p.operator_id,p.create_by,p.create_time, p.update_by, p.update_time,o.pic_url, o.job_type,o.celebrate_date,o.user_id,
-        o.user_name, o.police_no, o.police_type,o.tel,o.status, o.email,o.sex, o.operator_type, o.certificate_type,
-        o.certificate_name, o.certificate_no, o.certificate_file_id
-        from professional_work p left join uav_operator o on p.operator_id=o.usr_id
+        o.user_name, o.police_no, o.police_type,o.tel
+        from professional_work p left join uav_operator o on p.operator_id=o.user_id
         <where>
             and operator_id = #{operatorId}
             <if test="awardsContent != null "> and awards_content like concat('%', #{awardsContent}, '%')</if>
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by o.create_Time desc
     </select>
 
-    <select id="selectUavOperatorById" resultType="com.djhk.uav.uav.model.UavOperatorProfession">
+    <select id="selectUavOperatorById" resultMap="UavOperatorResult">
         <include refid="selectUavOperatorVo"/>
         where id = #{id}
     </select>