From 321a74059773cfecc01d6313f7c2e2d45545d6d3 Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期五, 18 四月 2025 17:46:31 +0800
Subject: [PATCH] 4.18v1.1.0

---
 src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java b/src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java
index eb68bef..9a4a707 100644
--- a/src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java
+++ b/src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java
@@ -23,7 +23,7 @@
 //    @Select({"select * from tb_person where p_fencename = #{name}"})
 //    List<TbPerson> findAllperson(String name);
 
-    @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where  p_online = '1' AND p.companyid = #{company} AND (p.p_tagid = #{name} or p.p_name = #{name})")
+    @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where  p_online = '1' AND p.company = #{company} AND (p.p_tagid = #{name} or p.p_name = #{name})")
     TbPerson findOnePerson(@Param("name")String name,@Param("company")String company);
 
     @Select("SELECT\n" +
@@ -37,10 +37,10 @@
             "\tLIMIT 1;")
     TbPerson upTag();
 
-    @Select("SELECT p.p_tagid,p.p_power,p.p_name,p_online,p.p_image,p.baoliu2,p.baoliu3,p.baoliu13,p.baoliu4,p.baoliu19,p.p_sos,p.p_addtiem,p.p_department,p.companyid as companyid,d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.p_online = 1 and p.companyid = #{company}")
+    @Select("SELECT p.p_tagid,p.p_power,p.p_name,p_online,p.p_image,p.baoliu2,p.baoliu3,p.baoliu13,p.baoliu4,p.baoliu19,p.p_sos,p.p_addtiem,p.p_department,p.company as company,d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.p_online = 1 and p.company = #{company}")
     List<TbPersonAndDepartment> findAllBuMen(@Param("company")String company);
 
-    @Select("SELECT p.p_tagid as id,p.p_name as name,p.baoliu2 as baoliu2,p.baoliu3 as baoliu3,p.baoliu19 as baoliu19,p.p_department as pdepartment,p.baoliu4 as baoliu4,p.companyid as companyid,p.p_power as ppower,p.p_online as online FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.companyid = #{company}")
+    @Select("SELECT p.p_tagid as id,p.p_name as name,p.baoliu2 as baoliu2,p.baoliu3 as baoliu3,p.baoliu19 as baoliu19,p.p_department as pdepartment,p.baoliu4 as baoliu4,p.company as company,p.p_power as ppower,p.p_online as online FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.company = #{company}")
     List<PersonCesium> findAllBuMenCesium(@Param("company")String company);
 
 }

--
Gitblit v1.9.3