From 6811e1eda758e6a7b885da42fc7510465d96056f Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 8 Jan 2021 10:55:58 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/ApiWorkUserController.java | 4 ++--
 .../src/main/resources/mapper/PartyTopicUserAttitudeDao.xml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
index ca91c091..4fdf3077 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
@@ -119,7 +119,7 @@ public class ApiWorkUserController {
      * @return
      */
     @PostMapping("swagger/authenticateResidentPass")
-    @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_PASS,referenceId = "#{formDTO.getUserId}",userId = "#{formDTO.getUserId}",gridId = "#{dto.getGridId}")
+    @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_PASS,referenceId = "#{formDTO.getUserId}",userId = "#{formDTO.getUserId}",gridId = "#{formDTO.getGridId}")
     public Result authenticateResidentPass(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return workUserService.authenticateResident(formDTO);
@@ -133,7 +133,7 @@ public class ApiWorkUserController {
      * @return
      */
     @PostMapping("swagger/authenticateResidentNoPass")
-    @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_NO_PASS,referenceId = "#{formDTO.getUserId}",userId = "#{formDTO.getUserId}",gridId = "#{dto.getGridId}")
+    @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_NO_PASS,referenceId = "#{formDTO.getUserId}",userId = "#{formDTO.getUserId}",gridId = "#{formDTO.getGridId}")
     public Result authenticateResidentNoPass(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return workUserService.authenticateResident(formDTO);
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicUserAttitudeDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicUserAttitudeDao.xml
index 608a191a..8248a864 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicUserAttitudeDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicUserAttitudeDao.xml
@@ -19,7 +19,7 @@
         delete from epdc_party_topic_user_attitude where id = #{id}
     </delete>
     <select id="getPartyTopicUserAttitudeDTO" resultType="com.elink.esua.epdc.dto.PartyTopicUserAttitudeDTO">
-        select id from epdc_party_topic_user_attitude where PARTY_TOPIC_ID = #{topicId} and USER_ID = #{userId}
+        select id from epdc_party_topic_user_attitude where PARTY_TOPIC_ID = #{topicId} and USER_ID = #{userId} and DEL_FLAG = '0' limit 1
     </select>