Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.13:3000/root/govern

Browse Source
This commit is contained in:
huangzj
2023-07-05 13:55:06 +08:00
parent e2a1818dd3 7c49f4dda7
commit 9a112bb384
9 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java
View File

@@ -24,5 +24,5 @@ public interface CsGroupMapper extends BaseMapper<CsGroup> {
List<CsGroupVO> getArrayData(@Param("list") List<String> list);
Page<DataGroupTemplateVO> getGroupDataList(IPage<DataGroupTemplateVO> page, @Param("id") String id);
Page<DataGroupTemplateVO> getGroupDataList(IPage<DataGroupTemplateVO> page, @Param("id") String id, @Param("searchValue") String searchValue);
}

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml
View File

@@ -69,8 +69,10 @@
cs_group
where
data_set_id = #{id} and is_show = 1
order by
sort
<if test="searchValue != null and searchValue !=''">
and group_name like concat('%',#{searchValue},'%')
</if>
order by sort
</select>
</mapper>