From 8439beb0f779dbc5c3f88f088d6969209f1a31d3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 16:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=9A=E5=91=98=E5=BA=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=AA=E5=85=81=E8=AE=B8=E4=B8=80=E4=B8=AA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=A4=E8=AF=81=E6=BF=80=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/IdCardNoValidatorUtils.java | 2 +- .../dao/PartymemberAuthRecordDao.java | 4 +- .../impl/PartymemberBaseInfoServiceImpl.java | 10 ++--- .../partymember/PartymemberAuthRecordDao.xml | 1 + .../partymember/PartymemberBaseInfoDao.xml | 43 ++++++++++++++----- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java index 2aa3e2c964..08a96295ac 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java @@ -46,7 +46,7 @@ public class IdCardNoValidatorUtils { return false; } } else { - logger.info(String.format("身份证号%s最后一位为数字")); + logger.info(String.format("身份证号%s最后一位为数字",idCardNo)); } } if (idCardNo.length() == 18) { diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java index b49ca7552f..5957ee1fb0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java @@ -21,6 +21,8 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 党员认证记录表 * @@ -37,5 +39,5 @@ public interface PartymemberAuthRecordDao extends BaseDao selectByPartyMemberBaseInfoId(String partymemberBaseInfoId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java index ae51f2cc19..35e890d7b7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java @@ -441,10 +441,10 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl entityList = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(partyMemberId); + if (null != entityList&&entityList.size()>0) { partyMemberBaseInfoDetailResultDTO.setStatus(Boolean.TRUE); - partyMemberBaseInfoDetailResultDTO.setActiveDesc(entity.getAuthDesc()); + partyMemberBaseInfoDetailResultDTO.setActiveDesc(entityList.get(0).getAuthDesc()); } else { partyMemberBaseInfoDetailResultDTO.setStatus(Boolean.FALSE); partyMemberBaseInfoDetailResultDTO.setActiveDesc(""); @@ -456,8 +456,8 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl entityList = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(formDTO.getPartyMemberId()); + if (null != entityList&&entityList.size()>0) { throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_MEMBER.getCode()); } this.deleteById(formDTO.getPartyMemberId()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml index f61badbc80..7bb2065080 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml @@ -25,5 +25,6 @@ select * from partymember_auth_record where DEL_FLAG='0' and PARTYMEMBER_BASE_INFO_ID=#{partymemberBaseInfoId} + order by CREATED_TIME desc \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml index b7aa868f90..1b2ea4f5ee 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml @@ -25,33 +25,54 @@ SELECT * FROM - partymember_base_info + partymember_base_info pbi WHERE - CUSTOMER_ID = #{customerId} - AND ID_CARD = #{idCard} - AND DEL_FLAG = 0 + pbi.CUSTOMER_ID = #{customerId} + AND pbi.ID_CARD = #{idCard} + AND pbi.DEL_FLAG = 0 + AND NOT EXISTS (SELECT + * + FROM + partymember_auth_record m + WHERE + pbi.id=m.PARTYMEMBER_BASE_INFO_ID + and m.del_flag='0')