From 27d6756a1b9417f996220862da4ea3a963dbab1e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 23 Nov 2020 17:11:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E4=B8=AA=E6=95=B0?= =?UTF-8?q?=E4=B8=8D=E8=B6=85=E8=BF=875=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../main/java/com/epmet/service/impl/BadgeServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 4df4597273..71b09320b4 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -99,6 +99,7 @@ public enum EpmetErrorCode { //徽章管理 DUPLICATE_BADGE_NAME(8515, "徽章名已存在"), DUPLICATE_PARTY_BADGE_NAME(8516, "不可删除党员徽章"), + NUMBER_BADGE_ERROR(8517, "徽章最多设置5个"), // 该错误不会提示给前端，只是后端传输错误信息用。 ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"), diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index 0e0b6012a9..0611b34385 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -159,6 +159,11 @@ public class BadgeServiceImpl extends BaseServiceImpl imp @Override @Transactional(rollbackFor = Exception.class) public void add(TokenDto tokenDto, AddBadgeFormDTO formDTO) { + //徽章总数校验 + List allList = baseDao.selectList(tokenDto.getCustomerId()); + if (CollectionUtils.isNotEmpty(allList) && allList.size() > NumConstant.FIVE) { + throw new RenException(EpmetErrorCode.NUMBER_BADGE_ERROR.getCode()); + } //重名校验 List list = baseDao.getDuplicateName(tokenDto.getCustomerId(), formDTO.getBadgeName()); if (CollectionUtils.isNotEmpty(list)) { From 1f5afb7bd279c461fa9612f35c1ab63b073d73bf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 23 Nov 2020 17:16:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index 80ea8028b6..e41797403a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -35,7 +35,6 @@ WHERE ub.DEL_FLAG = '0' AND b.DEL_FLAG = 0 AND ub.CERTIFICATION_AUTID_STATUS = 'approved' - AND b.CUSTOMER_ID = 'default' AND b.BADGE_STATUS = 'online' AND ub.IS_OPENED = 1 AND ub.USER_ID = #{userId}