Merge remote-tracking branch 'remotes/origin/dev_pyscreen' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java

@@ -277,7 +277,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
 
 
     private String convertPercentStr(BigDecimal percent){
-        if(null == percent || BigDecimal.ZERO == percent) return "0.00%";
+        if (null == percent || BigDecimal.ZERO.equals(percent)) return "0.00%";
         String percentStr = percent.setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
         return percentStr.concat(ModuleConstant.SYMBOL_PERCENT);
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java

@@ -329,7 +329,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
 
 
     private String convertPercentStr(BigDecimal percent){
-        if(null == percent || BigDecimal.ZERO == percent) return "0.0%";
+        if (null == percent || BigDecimal.ZERO.equals(percent)) return "0.0%";
         String percentStr = percent.setScale(NumConstant.ONE, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
         return percentStr.concat(ModuleConstant.SYMBOL_PERCENT);
     }