| | |
| | | .eq(MpPassAccessArea::getDelFlag, 0) |
| | | .eq(MpPassAccessArea::getPid, p) |
| | | .like(StringUtils.hasText(areaName), MpPassAccessArea::getAreaName, trim(areaName)) |
| | | .orderByDesc(MpPassAccessArea::getCreateTime); |
| | | .orderByAsc(MpPassAccessArea::getAreaName) |
| | | .orderByAsc(MpPassAccessArea::getId); |
| | | Page<MpPassAccessArea> pg = mpPassAccessAreaMapper.selectPage(new Page<>(page, size), q); |
| | | return pg.convert(this::toListVo); |
| | | } |
| | |
| | | MpPassAccessArea e = new MpPassAccessArea(); |
| | | e.setPid(pid); |
| | | e.setAreaName(name); |
| | | e.setRemark(trimToNull(req.getRemark())); |
| | | e.setAreaDesc(trimToNull(req.getAreaDesc())); |
| | | e.setRemark(trimToEmpty(req.getRemark())); |
| | | e.setAreaDesc(trimToEmpty(req.getAreaDesc())); |
| | | mpPassAccessAreaMapper.insert(e); |
| | | MpPassAccessArea fresh = mpPassAccessAreaMapper.selectById(e.getId()); |
| | | if (fresh == null || !StringUtils.hasText(fresh.getUuid())) { |
| | |
| | | e.setPid(targetPid); |
| | | e.setAreaName(name); |
| | | if (req.getRemark() != null) { |
| | | e.setRemark(trimToNull(req.getRemark())); |
| | | e.setRemark(trimToEmpty(req.getRemark())); |
| | | } |
| | | e.setAreaDesc(trimToNull(req.getAreaDesc())); |
| | | e.setAreaDesc(trimToEmpty(req.getAreaDesc())); |
| | | mpPassAccessAreaMapper.updateById(e); |
| | | evictMiniPassAccessAreaTreeCache(); |
| | | } |
| | |
| | | String t = s.trim(); |
| | | return t.isEmpty() ? null : t; |
| | | } |
| | | |
| | | private static String trimToEmpty(String s) { |
| | | return s == null ? "" : s.trim(); |
| | | } |
| | | } |