Merge remote-tracking branch 'origin/hotfix/lc_partyTagBug'

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1150,7 +1150,7 @@ public class AppUserServiceImpl implements AppUserService {
             if (partyFlag) {
                 // 如果是党员，不再进行完善个人信息处理
                 if (!user.getIdentityNo().equals(identityNo) || !user.getRealName().equals(realName)) {
-                    return new Result().error("姓名或身份证号码有误，请核实信息");
+                    return new Result().error("您已认证为党员，不能更改姓名和身份证号");
                 }
             } else {
                 // 非党员，调用用户完善个人信息接口

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java

@@ -19,6 +19,10 @@ public class CachingUserInfoDTO {
      * 用户ID
      */
     private String userId;
+    /**
+     * 党员标识
+     */
+    private String partyFlag;
 
     /**
      * 昵称

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
+import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -66,6 +67,7 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.UserGridRelationService;
 import com.elink.esua.epdc.service.UserInvitationRecordService;
 import com.elink.esua.epdc.service.UserService;
+import com.elink.esua.epdc.service.UserTagRelationService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -99,6 +101,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private AdminFeignClient adminFeignClient;
     @Autowired
     private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
+    @Autowired
+    private UserTagRelationService userTagRelationService;
 
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
@@ -613,6 +617,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             //用户认证历史
             UserAuthenticateHistoryEntity userAuthenticateHistoryEntity = new UserAuthenticateHistoryEntity();
             if (selectCount == NumConstant.ZERO) {
+                // 党员认证失败,移除用户身份标签
+                userTagRelationService.removeUserTagRelation(completeAppUser.getId(), UserTagEnum.PARTY_MEMBER.value());
                 // 党员库中没有，存进党员认证失败表
                 PartyAuthenticationFailedEntity authenticationFailedEntity = ConvertUtils.sourceToTarget(partyMembersEntity, PartyAuthenticationFailedEntity.class);
                 authenticationFailedEntity.setUserId(userId);
@@ -635,6 +641,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo)
                         .eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
                 this.partyMembersDao.update(partyMembersEntity, partyUpdate);
+                // 党员认证成功,生成用户身份标签
+                userTagRelationService.addUserTagRelation(completeAppUser.getId(), UserTagEnum.PARTY_MEMBER.value());
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value());
                 userDto.setPartyFlag(YesOrNoEnum.YES.value());//是否是党员(0-否，1-是)  认证失败：0
                 userDto.setRegisterTime(new Date());// 认证成功之后更新认证时间

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -404,6 +404,7 @@
 
     <resultMap id="CachingUserInfoDTOMap" type="com.elink.esua.epdc.dto.CachingUserInfoDTO">
         <result property="userId" column="ID"/>
+        <result property="partyFlag" column="PARTY_FLAG"/>
         <result property="nickname" column="NICKNAME"/>
         <result property="mobile" column="MOBILE"/>
         <result property="faceImg" column="FACE_IMG"/>
@@ -413,7 +414,7 @@
         <result property="remark" column="REMARK"/>
         <result property="gridId" column="gridId"/>
         <result property="grid" column="grid"/>
-        <collection property="userTagInfos" select="com.elink.esua.epdc.dao.UserTagDao.selectByUserId"
+        <collection property="userTagInfos" select="com.elink.esua.epdc.dao.UsUserServiceImpl.javaerTagDao.selectByUserId"
                     column="id">
         </collection>
     </resultMap>
@@ -429,6 +430,7 @@
             eu.REAL_NAME,
             eu.STATE,
             eu.REMARK,
+            eu.PARTY_FLAG,
         (select r.GRID_ID
             from epdc_user_grid_relation r
             where r.USER_ID=eu.ID
@@ -462,6 +464,7 @@
         eu.REAL_NAME,
         eu.STATE,
         eu.REMARK,
+        eu.PARTY_FLAG,
         (select r.GRID_ID
         from epdc_user_grid_relation r
         where r.USER_ID=eu.ID