diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagRelationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagRelationDao.java index 9eff35984..9a5303bd8 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagRelationDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserTagRelationDao.java @@ -42,4 +42,5 @@ public interface UserTagRelationDao extends BaseDao { */ void removeUserTagRelation(@Param("userId") String userId, @Param("tagCode") String tagCode); + void delUserTag(String id, String tagId); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagRelationService.java index 380ed8150..188332a3e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagRelationService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserTagRelationService.java @@ -113,4 +113,15 @@ public interface UserTagRelationService extends BaseService implem entity.setId(form.getId()); entity.setRemark(form.getRemark()); entity.setExamineFlag(form.getExamineStatus()); - if (partyStandardBearerApplyService.updateById(entity)) { + + if (entity.getExamineFlag().equals(PartyStandardBearerApplyEntity.ExamineFlagEnum.PASS.value())) { + if (partyStandardBearerApplyService.updateById(entity)) { + String TagId = baseDao.selectTagId(UserTagEnum.PARTY_STANDARD_BEARER.value()); + UserTagRelationEntity TagRelEntity = new UserTagRelationEntity(); + TagRelEntity.setUserId(form.getId()); + TagRelEntity.setTagId(TagId); + userTagRelationService.insert(TagRelEntity); + return new Result(); + } + } + if (entity.getExamineFlag().equals(PartyStandardBearerApplyEntity.ExamineFlagEnum.WAIT)) { String TagId = baseDao.selectTagId(UserTagEnum.PARTY_STANDARD_BEARER.value()); - UserTagRelationEntity TagRelEntity = new UserTagRelationEntity(); - TagRelEntity.setUserId(form.getId()); - TagRelEntity.setTagId(TagId); - userTagRelationService.insert(TagRelEntity); + userTagRelationService.delUserTag(form.getId(), TagId); return new Result(); } return new Result().error("党员亮旗审核处理失败"); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagRelationServiceImpl.java index ebd89724f..77aaa375e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserTagRelationServiceImpl.java @@ -141,6 +141,20 @@ public class UserTagRelationServiceImpl extends BaseServiceImpl + + DELETE + FROM + epdc_user_tag_relation + WHERE + userId = #{id} + AND TAG_ID = #{tagId} +