From b59994e2c9974618d6c579cf3893a504c94fc2f7 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 28 十一月 2023 08:38:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
index 07d97a3..d932fb5 100644
--- a/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
+++ b/hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
@@ -109,6 +109,9 @@
                 <if test="userId !=null and userId !=''">
                     sdu.user_id=#{userId} AND
                 </if>
+                <if test="userType !=null and userType !=''">
+                    spu.user_type=#{userType} AND
+                </if>
             </trim>
         </where>
 
@@ -964,4 +967,34 @@
         </trim>
     </insert>
 
+    <select id="queryGroups" resultType="hashmap">
+        select id,group_id as groupId,group_name as groupName from t_audio_group
+    </select>
+
+    <select id="queryHelmetWarn" resultType="hashmap">
+        select hr.device_id as deviceId,hr.sos_type,hr.user_name as userName,'' as position,hr.sm_time
+        from t_helmet_report hr
+        order by hr.sm_time
+        limit 10
+    </select>
+
+    <select id="queryAreaInfo" resultType="com.thhy.staff.modules.biz.platuser.entity.AreaAdmin">
+        select reg.id as areaId,reg.region as areaName
+        from t_region_hazard_inform reg
+    </select>
+
+    <select id="queryAdminByArea" resultType="com.thhy.staff.modules.biz.platuser.entity.NamePhoneDepart">
+        select rwu.user_id,spu.real_name as realName,spu.phone,spu.photo,sd.depart_name as departName
+        from t_region_warranty_user rwu
+                 left join sys_plat_user spu on spu.user_id = rwu.user_id
+                 left join sys_depart_user sdu on sdu.user_id = spu.user_id
+                 left join sys_depart sd on sd.depart_id = sdu.depart_id
+        where rwu.region_warranty_id = #{regionWarrantyId}
+        order by rwu.user_type
+    </select>
+
+    <select id="faceArea" resultType="string">
+        select DISTINCT area_name as areaName from t_face_device where area_name is not null
+    </select>
+
 </mapper>

--
Gitblit v1.9.3