From a1188a66f0549522068adde2fee430015077410c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 11 十月 2023 15:48:14 +0800 Subject: [PATCH] 接口整理 --- server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java index e2eff99..dfba448 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java @@ -41,6 +41,7 @@ QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(BaseParam::getType,baseParam.getType()) + .eq(BaseParam::getIsdeleted,Constants.ZERO) .eq(BaseParam::getType,baseParam.getName()); Integer count = baseParamMapper.selectCount(wrapper); @@ -89,9 +90,10 @@ QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(BaseParam::getType,baseParam.getType()) + .eq(BaseParam::getIsdeleted,Constants.ZERO) .eq(BaseParam::getType,baseParam.getName()); - BaseParam baseParam1 = baseParamMapper.selectOne(wrapper); + BaseParam baseParam1 = baseParamMapper.selectOne(wrapper.last(" limit 1")); if (Objects.nonNull(baseParam1) && !baseParam1.getId().equals(baseParam.getId())){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締闂宸插瓨鍦�"); } @@ -124,7 +126,7 @@ @Override public BaseParam findOne(BaseParam baseParam) { QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam); - return baseParamMapper.selectOne(wrapper); + return baseParamMapper.selectOne(wrapper.last(" limit 1")); } @Override @@ -139,6 +141,7 @@ IPage<BaseParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); QueryWrapper<BaseParam> queryWrapper = new QueryWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); + pageWrap.getModel().setIsdeleted(Constants.ZERO); if (pageWrap.getModel().getId() != null) { queryWrapper.lambda().eq(BaseParam::getId, pageWrap.getModel().getId()); } @@ -160,7 +163,7 @@ queryWrapper.lambda().eq(BaseParam::getIsdeleted, pageWrap.getModel().getIsdeleted()); } if (pageWrap.getModel().getName() != null) { - queryWrapper.lambda().eq(BaseParam::getName, pageWrap.getModel().getName()); + queryWrapper.lambda().like(BaseParam::getName, pageWrap.getModel().getName()); } if (pageWrap.getModel().getSortnum() != null) { queryWrapper.lambda().eq(BaseParam::getSortnum, pageWrap.getModel().getSortnum()); @@ -172,18 +175,12 @@ queryWrapper.lambda().eq(BaseParam::getStatus, pageWrap.getModel().getStatus()); } if (pageWrap.getModel().getInfo() != null) { - queryWrapper.lambda().eq(BaseParam::getInfo, pageWrap.getModel().getInfo()); + queryWrapper.lambda().like(BaseParam::getInfo, pageWrap.getModel().getInfo()); } if (pageWrap.getModel().getRequired() != null) { queryWrapper.lambda().eq(BaseParam::getRequired, pageWrap.getModel().getRequired()); } - for(PageWrap.SortData sortData: pageWrap.getSorts()) { - if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { - queryWrapper.orderByDesc(sortData.getProperty()); - } else { - queryWrapper.orderByAsc(sortData.getProperty()); - } - } + queryWrapper.lambda().orderByAsc(BaseParam::getSortnum); return PageData.from(baseParamMapper.selectPage(page, queryWrapper)); } -- Gitblit v1.9.3