From 846a8a281b8429760346bba3bd9e568d2c96fdb6 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 1 Jun 2022 09:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/partymember/IcPartyMemberPointDTO.java         |  8 ++++----
 .../service/impl/IcPartyMemberPointServiceImpl.java    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java
index 4d299c24e0..90879a74f4 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberPointDTO.java
@@ -44,7 +44,7 @@ public class IcPartyMemberPointDTO implements Serializable {
     /**
      * 基础积分分值
      */
-	private Integer basePoint = 0;
+	private Integer basePoint;
 
     /**
      * 基础积分选项 英文逗号隔开
@@ -54,7 +54,7 @@ public class IcPartyMemberPointDTO implements Serializable {
     /**
      * 民主评议积分分值
      */
-	private Integer reviewPoint = 0;
+	private Integer reviewPoint;
 
     /**
      * 民主评议积分选项
@@ -64,7 +64,7 @@ public class IcPartyMemberPointDTO implements Serializable {
     /**
      * 激励积分分值
      */
-	private Integer inspirePoint = 0;
+	private Integer inspirePoint;
 
     /**
      * 激励积分选项
@@ -74,7 +74,7 @@ public class IcPartyMemberPointDTO implements Serializable {
     /**
      * 警示扣分分值
      */
-	private Integer warnPoint = 0;
+	private Integer warnPoint;
 
     /**
      * 警示扣分选项
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
index d89811d029..ae25295b44 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
@@ -83,17 +83,17 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyMemberPointDTO dto) {
-        if(dto.getBasePoint() == 0){
+        if(dto.getBasePoint() == null){
             dto.setBasePoint(NumConstant.ZERO);
         }
-        if(dto.getReviewPoint() == 0){
+        if(dto.getReviewPoint() == null){
             dto.setInspirePoint(NumConstant.ZERO);
         }
-        if(dto.getReviewPoint() == 0){
-            dto.setReviewPoint(NumConstant.ZERO);
+        if(dto.getInspirePoint() == null){
+            dto.setInspirePoint(NumConstant.ZERO);
         }
         dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint());
-        if(dto.getWarnPoint() == 0) {
+        if(dto.getWarnPoint() != null) {
             if (dto.getWarnPoint() > 0) {
                 dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
             } else {