临时提交

This commit is contained in:
648540858
2024-08-05 17:59:20 +08:00
parent 96bbd19e81
commit ce0f0c4ac8
13 changed files with 160 additions and 91 deletions

View File

@@ -305,7 +305,9 @@ public interface CommonGBChannelMapper {
CommonGBChannel queryByStreamProxyId(@Param("streamProxyId") Integer streamProxyId);
@SelectProvider(type = ChannelProvider.class, method = "queryList")
List<CommonGBChannel> queryList(@Param("query") String query, @Param("online") Boolean online, @Param("hasCivilCode") Boolean hasCivilCode);
List<CommonGBChannel> queryList(@Param("query") String query, @Param("online") Boolean online,
@Param("hasCivilCode") Boolean hasCivilCode,
@Param("hasGroup") Boolean hasGroup);
@Select("<script>" +
" select " +

View File

@@ -99,8 +99,8 @@ public interface GroupMapper {
" false as is_leaf" +
" from wvp_common_group " +
" where device_id=business_group" +
" <if test='platformId != null'> platform_id = #{platformId} </if> " +
" <if test='platformId == null'> platform_id is null </if> " +
" <if test='platformId != null'> AND platform_id = #{platformId} </if> " +
" <if test='platformId == null'> AND platform_id is null </if> " +
" <if test='query != null'> AND (device_id LIKE concat('%',#{query},'%') OR name LIKE concat('%',#{query},'%'))</if> " +
" </script>")
List<GroupTree> queryBusinessGroupForTree(String query, Integer platformId);

View File

@@ -94,6 +94,12 @@ public class ChannelProvider {
if (params.get("hasCivilCode") != null && !(Boolean)params.get("hasCivilCode")) {
sqlBuild.append(" AND gb_civil_code is null");
}
if (params.get("hasGroup") != null && (Boolean)params.get("hasGroup")) {
sqlBuild.append(" AND gb_business_group_id is not null");
}
if (params.get("hasGroup") != null && !(Boolean)params.get("hasGroup")) {
sqlBuild.append(" AND gb_business_group_id is null");
}
return sqlBuild.toString();
}