diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java index 840b58ce..58a0122c 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java @@ -16,9 +16,13 @@ import java.util.List; public interface LawsSysApiInfoMapper extends BaseMapper { IPage getStandardData(Page page, - @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + @Param(Constants.WRAPPER) QueryWrapper queryWrapper, + @Param("foreignStandardReturnUrl") String foreignStandardReturnUrl, + @Param("enterpriseStandardReturnUrl")String enterpriseStandardReturnUrl); - List getStandardData(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List getStandardData(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, + @Param("foreignStandardReturnUrl") String foreignStandardReturnUrl, + @Param("enterpriseStandardReturnUrl")String enterpriseStandardReturnUrl); } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml index 949507ca..151bb1ac 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml @@ -6,13 +6,11 @@ diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java index f4cbeff6..d734f7ec 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java @@ -34,17 +34,24 @@ public class LawsSysApiInfoServiceImpl extends ServiceImpl> getStandardDataPage(StandardData standardData,Integer pageNo,Integer pageSize) { - // todo 未变更url + + // todo 未添加其他系统访问校验 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardNumber()),"standard_number",standardData.getStandardNumber()); queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardName()),"standard_name",standardData.getStandardName()); queryWrapper.eq(!StringUtils.isEmpty(standardData.getResourceType()),"resource_type",standardData.getResourceType()); queryWrapper.orderByDesc("create_time"); Page page = new Page<>(pageNo, pageSize); - return Result.OK(lawsSysApiInfoMapper.getStandardData(page,queryWrapper)); + return Result.OK(lawsSysApiInfoMapper.getStandardData(page,queryWrapper, foreignStandardReturnUrl, enterpriseStandardReturnUrl)); } @Override @@ -54,7 +61,13 @@ public class LawsSysApiInfoServiceImpl extends ServiceImpl