From 3c1c31a34e22cd0c1439928df2f4e09601b035c8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Apr 2021 15:22:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=B7=E5=BC=8F=20i?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 806d1b9960..b5e21ff6eb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -736,7 +736,7 @@ (SELECT ai.ID, ai.CREATED_BY AS userId, - DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime, + DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, IFNULL(ac.CONTENT,'') AS content, 'act' AS contentType, IFNULL(ac2.CONTENT,'') AS firstPhoto @@ -754,7 +754,7 @@ (SELECT n.ID, n.CREATED_BY AS userId, - DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime, + DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, n.CONTENT AS content, 'notice' AS contentType, IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto @@ -776,7 +776,7 @@ ((SELECT t.ID, t.CREATED_BY AS userId, - DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime, + DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, t.TOPIC_CONTENT AS content, t.`STATUS` AS status, IFNULL(t.ISSUE_ID,'') AS issueId, @@ -795,7 +795,7 @@ (SELECT ai.ID, ai.CREATED_BY AS userId, - DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime, + DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, IFNULL(ac.CONTENT,'') AS content, ai.`STATUS` AS status, '' AS issueId, @@ -814,7 +814,7 @@ (SELECT n.ID, n.CREATED_BY AS userId, - DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime, + DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, n.CONTENT AS content, '' AS status, '' AS issueId, From 3366200baeb7431eae280823078d4754c73fd96d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 23 Apr 2021 15:37:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/form/ApplyCreateGroupFormDTO.java | 1 - .../service/impl/ResiGroupServiceImpl.java | 18 +++++++++++------- .../epmet/modules/utils/ModuleConstant.java | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java index fc14ffd2f5..60550f0c4d 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java @@ -73,6 +73,5 @@ public class ApplyCreateGroupFormDTO implements Serializable { /** * 小组类型(ordinary:楼院小组 branch:支部小组) */ - @NotBlank(message = "小组类型不能为空") private String groupType; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 5a54c45f06..90b12f3dad 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -371,14 +371,18 @@ public class ResiGroupServiceImpl extends BaseServiceImpl booleanResult = epmetUserOpenFeignClient.selectIsPartyMemberByUserId(applyCreateGroupFormDTO.getUserId()); - if (!booleanResult.success()){ - throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR); - } - if (!booleanResult.getData()){ - throw new RenException(EpmetErrorCode.PARTY_MEMBER_CREATE_BRANCH_GROUP.getCode()); + if (StringUtils.isNotEmpty(applyCreateGroupFormDTO.getGroupType())) { + if (applyCreateGroupFormDTO.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH)) { + Result booleanResult = epmetUserOpenFeignClient.selectIsPartyMemberByUserId(applyCreateGroupFormDTO.getUserId()); + if (!booleanResult.success()) { + throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR); + } + if (!booleanResult.getData()) { + throw new RenException(EpmetErrorCode.PARTY_MEMBER_CREATE_BRANCH_GROUP.getCode()); + } } + }else { + applyCreateGroupFormDTO.setGroupType(ModuleConstant.GROUP_TYPE_ORDINARY); } //1、校验是否同名 List resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index 038b0ad745..e2a219f6e9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -390,6 +390,7 @@ public interface ModuleConstant extends Constant { * 小组类型:支部小组 */ String GROUP_TYPE_BRANCH = "branch"; + String GROUP_TYPE_ORDINARY = "ordinary"; String IS_PARTY_MEMBER_ERR = "查询此人是不是党员失败了";