From 91275344f85d2777be0f276e9d9da3f6f3fa6728 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 20 八月 2021 18:48:44 +0800
Subject: [PATCH] 实有人口和社区关系以及对应标签修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
index f71d619..7518a2d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
@@ -258,13 +258,13 @@
                     return R.fail("未查询到用户信息,记录积分失败");
                 }
                 //判断调查问卷调查的对象是什么身份,如果是党员和志愿者两种身份,则记录志愿者积分
-                if(questnaireDO.getForParty() && integralUser.getIsPartymember().equals(1)){
+                if(questnaireDO.getForParty().equals(1) && integralUser.getIsPartymember().equals(1)){
                     identityType = 2;
-                    if(questnaireDO.getForVolunteer() && integralUser.getIsVolunteer().equals(1)){
+                    if(questnaireDO.getForVolunteer().equals(1) && integralUser.getIsVolunteer().equals(1)){
                         identityType = 3;
                     }
                 }
-                if(questnaireDO.getForVolunteer() && integralUser.getIsVolunteer().equals(1)){
+                if(questnaireDO.getForVolunteer().equals(1) && integralUser.getIsVolunteer().equals(1)){
                     identityType = 3;
                 }
                 remark.append("参与调查问卷奖励积分");

--
Gitblit v1.7.1