完成删除逻辑

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<UserTagRelationEntity> {
      */
     void removeUserTagRelation(@Param("userId") String userId, @Param("tagCode") String tagCode);
 
+    void delUserTag(String id, String tagId);
 }

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<UserTagRelationEntit
      * @date 2020/4/10 13:28
      */
     void removeUserTagRelation(String userId, String tagCode);
+
+    /**
+     * 根据userId和tagId删除
+     *
+     * @param id
+     * @param tagId
+     * @return void
+     * @author LZN
+     * @date 2022/4/29 16:49
+     */
+    void delUserTag(String id, String tagId);
 }

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

@@ -2008,12 +2008,20 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> 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("党员亮旗审核处理失败");

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<UserTagRelationD
         this.updateUserTagInfo(userId);
     }
 
+    /**
+     * 根据userId和tagId删除
+     *
+     * @param id
+     * @param tagId
+     * @return void
+     * @author LZN
+     * @date 2022/4/29 16:49
+     */
+    @Override
+    public void delUserTag(String id, String tagId) {
+        baseDao.delUserTag(id, tagId);
+    }
+
     /**
      * @param userId 用户id
      * @return void

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

@@ -24,4 +24,12 @@
                 SELECT eut.id FROM epdc_user_tag eut WHERE eut.TAG_CODE = #{tagCode}
             )
     </delete>
+    <delete id="delUserTag">
+        DELETE
+        FROM
+            epdc_user_tag_relation
+        WHERE
+            userId = #{id}
+            AND TAG_ID = #{tagId}
+    </delete>
 </mapper>