drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdImplementListMapper.xml
@@ -21,6 +21,9 @@ <select id="selectGdImplementListPage" resultMap="gdImplementListResultMap"> select * from ja_gd_implement_list where is_deleted = 0 <if test="param2.implementName != null and param2.implementName != ''"> and implement_name like concat('%',#{param2.implementName},'%') </if> <if test="param2.matterName != null and param2.matterName != ''"> and matter_name like concat('%',#{param2.matterName},'%') </if> @@ -28,7 +31,7 @@ and matter_code like concat('%',#{param2.matterCode},'%') </if> <if test="param2.areaCode != null and param2.areaCode != ''"> and area_code like concat('%',#{param2.areaCode},'%') and area_code like concat(#{param2.areaCode},'%') </if> <if test="param2.orgCode != null and param2.orgCode != ''"> and org_code like concat('%',#{param2.orgCode},'%') drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/GdImplementListPageParam.java
@@ -50,6 +50,12 @@ @ApiModelProperty(value = "目录编码") private String catalogCode; /** * 实施清单名称 */ @ApiModelProperty(value = "实施清单名称") private String implementName; @ApiModelProperty(value = "部门集合",hidden = true) private List<Long> deptList; drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java
@@ -27,6 +27,7 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.sxkj.common.utils.HeaderUtils; import org.sxkj.gd.common.GenericConverter; import org.sxkj.gd.common.IdParam; import org.sxkj.gd.implement.entity.GdImplementListEntity; @@ -61,6 +62,7 @@ public IPage<GdImplementListVO> selectGdImplementListPage(IPage<GdImplementListVO> page, GdImplementListPageParam gdImplementList) { List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())); gdImplementList.setDeptList(deptList); gdImplementList.setAreaCode(HeaderUtils.formatAreaCode(gdImplementList.getAreaCode())); return page.setRecords(baseMapper.selectGdImplementListPage(page, gdImplementList)); }