From cc8dcb9196d1041029ab5194bac7d2dc75eecc6d Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 2 Dec 2025 18:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E5=90=8D=E5=88=B6?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java    | 3 ++-
 .../src/main/resources/mappers/basic/UserRelationMapper.xml   | 2 +-
 .../src/main/resources/mappers/jobType/JobTypeMapper.xml      | 2 +-
 .../src/main/resources/mappers/manager/OrgMapper.xml          | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java b/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java
index 0e193e0..f99e92d 100644
--- a/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java
+++ b/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java
@@ -4,6 +4,7 @@ import com.bonus.hnrn.rnbmw.manager.entity.OrgBean;
 import com.bonus.hnrn.rnbmw.manager.entity.ZNode;
 import com.bonus.hnrn.rnbmw.manager.model.SysUser;
 import org.springframework.stereotype.Repository;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,7 +13,7 @@ import java.util.List;
 public interface OrgDao {
     List<ZNode> getAll(SysUser user);
 
-    List<ZNode> getTeamTypeList(String id);
+    List<ZNode> getTeamTypeList(@Param("companyId") String id);
 
     int addOrg(OrgBean bean);
 
diff --git a/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml b/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml
index 495ea2f..6a2d8ba 100644
--- a/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml
+++ b/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml
@@ -104,7 +104,7 @@
        REPLACE INTO bm_sub_pro_relation(sub_id,pro_id) VALUES (#{subId},#{proId});
     </insert>
 	<select id="selectSubPro"  resultType="com.bonus.hnrn.rnbmw.manager.entity.SubProBean" >
-     SELECT sub_id FROM bm_sub_pro_relation where pro_id=#{proId}
+     SELECT sub_id as subId FROM bm_sub_pro_relation where pro_id=#{proId}
     </select>
 	<!--删除分包商和工程关系-->
 	<delete id="delSubPro"  parameterType="com.bonus.hnrn.rnbmw.manager.entity.SubProBean" >
diff --git a/HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml b/HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml
index 9dd8247..2ace139 100644
--- a/HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml
+++ b/HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml
@@ -30,7 +30,7 @@
                 and instr(job_type,#{params.status}) &gt; 0
             </if>
         </if>
-        ${params.orderBy}
+        ORDER BY update_time desc ,id desc
         limit #{offset}, #{limit}
     </select>
 
diff --git a/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml b/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml
index 90e2cf8..ff8471e 100644
--- a/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml
+++ b/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml
@@ -47,8 +47,8 @@
 		bstt.ID AS id,bstt.`NAME` AS name,'0' AS pId,'0' AS companyId
 		FROM bm_sub_team_type bstt
 		WHERE bstt.IS_ACTIVE = '1'
-		<if test="id != null and id != ''">
-		 and  bstt.company_id = #{id}
+		<if test="companyId != null and companyId != ''">
+			AND bstt.company_id = #{companyId}
 		</if>
 	</select>