Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
马三炮 2025-12-02 09:55:56 +08:00
commit 3316f1e66f
2 changed files with 9 additions and 6 deletions

View File

@ -67,11 +67,12 @@ public class KqCmdBean {
private String phone; private String phone;
private String createTime; private String createTime;
private String isHand;
public KqCmdBean() { public KqCmdBean() {
} }
public KqCmdBean(String deviceCode, String subName, String teamName,Integer proId, Integer subId, Integer teamId) { public KqCmdBean(String deviceCode, String subName, String teamName, Integer proId, Integer subId, Integer teamId) {
this.deviceCode = deviceCode; this.deviceCode = deviceCode;
this.subName = subName; this.subName = subName;
this.teamName = teamName; this.teamName = teamName;

View File

@ -4,11 +4,13 @@
<select id="getUserByDeviceId" resultType="com.bonus.bmw.domain.vo.KqCmdBean"> <select id="getUserByDeviceId" resultType="com.bonus.bmw.domain.vo.KqCmdBean">
select select
user_id as worker_id, kul.user_id as worker_id,
user_name as worker_name, kul.user_name as worker_name,
user_phone as phone, kul.user_phone as phone,
dev_code as device_code kul.dev_code as device_code,
from kq_user_list if(bwem.worker_id is null,1,0) as isHand
from kq_user_list kul
LEFT JOIN bm_worker_ein_msg bwem ON kul.user_id = bwem.worker_id and bwem.pro_id = #{proId}
where dev_code = #{deviceCode} where dev_code = #{deviceCode}
</select> </select>