bonus
/
hn_cloud_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
haozq 2025-12-03 10:51:51 +08:00
parent 1ad7dd43ad cc8dcb9196
commit 704164c610
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java
View File

@ -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.entity.ZNode;
import com.bonus.hnrn.rnbmw.manager.model.SysUser; import com.bonus.hnrn.rnbmw.manager.model.SysUser;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -12,7 +13,7 @@ import java.util.List;
public interface OrgDao { public interface OrgDao {
List<ZNode> getAll(SysUser user); List<ZNode> getAll(SysUser user);
List<ZNode> getTeamTypeList(String id); List<ZNode> getTeamTypeList(@Param("companyId") String id);
int addOrg(OrgBean bean); int addOrg(OrgBean bean);

2
HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml
View File

@ -104,7 +104,7 @@
REPLACE INTO bm_sub_pro_relation(sub_id,pro_id) VALUES (#{subId},#{proId}); REPLACE INTO bm_sub_pro_relation(sub_id,pro_id) VALUES (#{subId},#{proId});
</insert> </insert>
<select id="selectSubPro" resultType="com.bonus.hnrn.rnbmw.manager.entity.SubProBean" > <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> </select>
<!--删除分包商和工程关系--> <!--删除分包商和工程关系-->
<delete id="delSubPro" parameterType="com.bonus.hnrn.rnbmw.manager.entity.SubProBean" > <delete id="delSubPro" parameterType="com.bonus.hnrn.rnbmw.manager.entity.SubProBean" >

2
HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml
View File

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

4
HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml
View File

@ -47,8 +47,8 @@
bstt.ID AS id,bstt.`NAME` AS name,'0' AS pId,'0' AS companyId bstt.ID AS id,bstt.`NAME` AS name,'0' AS pId,'0' AS companyId
FROM bm_sub_team_type bstt FROM bm_sub_team_type bstt
WHERE bstt.IS_ACTIVE = '1' WHERE bstt.IS_ACTIVE = '1'
<if test="id != null and id != ''"> <if test="companyId != null and companyId != ''">
and bstt.company_id = #{id} AND bstt.company_id = #{companyId}
</if> </if>
</select> </select>