支部管理bug修改：党员库信息只允许一个用户认证激活

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) {

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<PartymemberAuthRecordE
      * @description 根据党员库id,查询党员认证信息
      * @Date 2020/6/18 0:04
      **/
-    PartymemberAuthRecordEntity selectByPartyMemberBaseInfoId(String partymemberBaseInfoId);
+    List<PartymemberAuthRecordEntity> selectByPartyMemberBaseInfoId(String partymemberBaseInfoId);
 }

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<PartymemberB
 		if (null != partyMemberBaseInfoDetailResultDTO) {
 			//性别
 			partyMemberBaseInfoDetailResultDTO.setGender(IdCardNoValidatorUtils.getGender(partyMemberBaseInfoDetailResultDTO.getIdCard()));
-			PartymemberAuthRecordEntity entity = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(partyMemberId);
-			if (null != entity) {
+			List<PartymemberAuthRecordEntity> 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<PartymemberB
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO) {
-		PartymemberAuthRecordEntity entity = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(formDTO.getPartyMemberId());
-		if (null != entity) {
+		List<PartymemberAuthRecordEntity> entityList = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(formDTO.getPartyMemberId());
+		if (null != entityList&&entityList.size()>0) {
 			throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_MEMBER.getCode());
 		}
 		this.deleteById(formDTO.getPartyMemberId());

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
     </select>
 </mapper>

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')
     </select>
     <select id="selectBaseInfoByMobile"
             resultType="com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity">
         SELECT
             *
         FROM
-            partymember_base_info
+            partymember_base_info pbi
         WHERE
-            CUSTOMER_ID = #{customerId}
-          AND MOBILE = #{mobile}
-          AND DEL_FLAG = 0
+            pbi.CUSTOMER_ID = #{customerId}
+          AND pbi.MOBILE = #{mobile}
+          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')
     </select>
     <select id="selectBaseInfoByName"
             resultType="com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity">
         SELECT
             *
         FROM
-            partymember_base_info
+            partymember_base_info pbi
         WHERE
-            CUSTOMER_ID = #{customerId}
+            pbi.CUSTOMER_ID = #{customerId}
           AND NAME = CONCAT(#{surname}, #{name})
-          AND DEL_FLAG = 0
+          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')
     </select>
 
     <!--  根据网格id分页查询待审核党员列表自动审核失败且已经填写补充信息的 -->