"setupMasterSlave.sh" did not exist on "60adb72dc1a8cf43a766d0b271a192112a3b4f00"
Commit 9b405d77 authored by 郭凡凡's avatar 郭凡凡

修改

parent 368d903a
......@@ -179,12 +179,12 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
@Override
public ResponseVO<PageInfo<OcpApiBaseVo>> getBaseByGroupCode(ApiBaseDto apiBaseReq) {
if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) {
if (apiBaseReq.getCurrentPage() == null || apiBaseReq.getPageSize() == null) {
return ResponseVO.error("分页参数不能为空");
}
apiGroupCode.add(apiBaseReq.getApiGroupCode());
setGroupIdValue(apiBaseReq.getApiGroupCompanyCode(), apiBaseReq.getApiGroupCode(), apiBaseReq.getApiPromotion());
PageHelper.startPage(apiBaseReq.getPageNum(), apiBaseReq.getPageSize());
PageHelper.startPage(apiBaseReq.getCurrentPage(), apiBaseReq.getPageSize());
apiBaseReq.setApiGroupCodeList(apiGroupCode);
List<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
apiGroupCode.clear();
......
......@@ -97,7 +97,7 @@
and oab.api_user_name like CONCAT('%', #{apiUserName}::text,'%')
</if>
<if test="apiPromotion !=null and apiPromotion!=''">
<if test="apiPromotion !=null ">
and oab.api_promotion = #{apiPromotion}
</if>
<if test="startCTime !=null and startCTime!= ''">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment