Merge remote-tracking branch 'origin/master'

collect_fees_hdx_api/fees-hdx-api/src/main/java/com/tofly/feesapi/sfgl/service/impl/YyQfmxServiceImpl.java

@@ -1948,7 +1948,8 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
      */
     private SfJsJg sfJs0(YhCbkxx cbkxx, YhKhjbxx yhxx, BigDecimal ljsl, BigDecimal bcsl) throws Exception {
         SfJsJg sfJsJg = new SfJsJg();
-        sfJsJg.setRks(yhxx.getRks().toString());
+//        sfJsJg.setRks(yhxx.getRks().toString());
+        sfJsJg.setRks(yhxx.getRks() != null ? yhxx.getRks().toString() : "0");
         //判断用户是否是低保户并且月累计量是否大于配置
         if (StringUtil.isNotEmpty(yhxx.getKhlb()) && yhxx.getKhlb().equals("2")) {
             String cwrq = gdcsbService.selectCwrq();