|
|
@@ -89,7 +89,7 @@ public interface AdminMapper {
|
|
|
"FROM sip_config sip\n" +
|
|
|
"JOIN device dev ON sip.sipDomain = dev.domain\n" +
|
|
|
"JOIN admin_sip a ON sip.id = a.sipId\n" +
|
|
|
- "WHERE a.adminId = ${adminId} AND dev.deviceId = ${deviceSipId};\n")
|
|
|
+ "WHERE a.adminId = ${adminId} AND dev.deviceId = '${deviceSipId}';\n")
|
|
|
/**
|
|
|
* 获取某个管理员设备,根据设备国标id
|
|
|
* @param adminId 管理员id
|
|
|
@@ -110,7 +110,9 @@ public interface AdminMapper {
|
|
|
|
|
|
@Select(
|
|
|
" <script>" +
|
|
|
- "SELECT d.*, sc.*" +
|
|
|
+ "SELECT d.*, sc.*," +
|
|
|
+ " (SELECT count(0) FROM device_channel WHERE " +
|
|
|
+ " deviceId=d.deviceId) as channelCount " +
|
|
|
" FROM device d" +
|
|
|
" JOIN sip_config sc ON d.domain = sc.sipDomain" +
|
|
|
" JOIN admin_sip a ON sc.id = a.sipId" +
|
