Merge remote-tracking branch 'origin/main'

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);
 

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" >

HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml

@@ -30,7 +30,7 @@
                 and instr(job_type,#{params.status}) > 0
             </if>
         </if>
-        ${params.orderBy}
+        ORDER BY update_time desc ,id desc
         limit #{offset}, #{limit}
     </select>
 

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>