更改推送功能 推送消息的remark如果为null则设置为“”

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/impl/ProjectPushListServiceImpl.java

@@ -95,7 +95,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                         String remark = null;
                         if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
                         else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
-
+                        if (remark == null) remark = "";
                         //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
                                 cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent()+remark,sysOrgCodes);
@@ -128,7 +128,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                         String remark = null;
                         if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
                         else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
-
+                        if (remark == null) remark = "";
                         //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
                                 cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent()+remark,sysOrgCodes);
@@ -159,7 +159,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                         String remark = null;
                         if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
                         else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
-
+                        if (remark == null) remark = "";
                         //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
                                 cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent()+remark,sysOrgCodes);
@@ -199,7 +199,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
             String remark = null;
             if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
             else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
-
+            if (remark == null) remark = "";
             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
                     cost.getTaskno(),cost.getTaskname(),"", username, "请及时处理合同额"+remark,orgcode);
             pushList.add(push);
@@ -235,7 +235,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
             String remark = null;
             if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"1")) remark = "（组批之后）";//组批之后
             else if(cost.getPccode()!=null && Objects.equals(cost.getStatus(),"0")) remark = "（组批之前）";//组批之前
-
+            if (remark == null) remark = "";
             ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
                     cost.getTaskno(),cost.getTaskname(),"", username, "请及时处理已收款"+remark,orgcode);
             pushList.add(push);

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/controller/WzOutboundOrderHController.java

@@ -96,7 +96,7 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
             if (endId > redisResultList.size() || endId == 0) endId = redisResultList.size();
             List<CLFCompareResultVO> resultList = redisResultList.subList(startId, endId);
             if (!resultList.isEmpty()) {
-                int pages = 0;
+                int pages;
                 pageNo = Optional.ofNullable(pageNo).orElse(0);
                 pageSize = Optional.ofNullable(pageSize).orElse(redisResultList.size());
                 if (redisResultList.size() < pageSize) {