From 8b745c1c559bf22e7ef3dd09adddcb508a3f8bea Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 17 Jul 2024 17:54:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=84=E7=90=86=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayPackCompanyProjectServiceImpl.java    | 8 +++-----
 .../jero/modules/system/service/impl/SysBaseApiImpl.java  | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
index 4cfc9d4b..f9edca11 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
@@ -451,13 +451,10 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                     PayWorkingGroup payWorkingGroup = payWorkingGroupMapper.selectById(workingGroupId);
                     BigDecimal yearChargeA = payWorkingGroup.getYearChargeA();
                     if (yearChargeA == null || new BigDecimal("0.00").equals(yearChargeA)){
-                        continue;
+                        yearChargeA = new BigDecimal("0.00");
                     }
                     PayWorkingGroupSubItem payWorking = null;
                     List<JSONObject> jsonObjects1 = sysBaseAPI.getLogByRequestParam(projectId);
-                    if (jsonObjects1.isEmpty()){
-                        continue;
-                    }
                     for (JSONObject jsonObject : jsonObjects1) {
                         String logContent = jsonObject.getString("logContent");
                         if ("工作组成员-添加".equals(logContent)||"工作组成员-修改".equals(logContent)||"企业端-工作组成员-修改".equals(logContent)){
@@ -465,7 +462,7 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                             requestParam = requestParam.substring(1,requestParam.length()-1);
                             PayWorkingGroupSubItem obj = JSONObject.parseObject(requestParam, PayWorkingGroupSubItem.class);
                             BigDecimal receivableAmount = obj.getReceivableAmount();
-                            if (new BigDecimal("0.00").equals(receivableAmount)){
+                            if (new BigDecimal("0.00").equals(receivableAmount) || receivableAmount == null){
                                 continue;
                             }else {
                                 payWorking = obj;
@@ -527,6 +524,7 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                     }else {
                         amountReceivable = new BigDecimal("2000");
                     }
+                    tbMember.setId(projectId);
                     tbMember.setAmountReceivable(amountReceivable);
                     BigDecimal noTaxAmount1 = amountReceivable.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
                     tbMember.setNoTaxAmount(noTaxAmount1);
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
index 372e9375..2ce27d49 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
@@ -1160,6 +1160,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		wrapper.like(SysLog::getRequestParam,requestParam);
 		wrapper.ne(SysLog::getLogContent,"打包项目维护-添加");
 		wrapper.ne(SysLog::getLogContent,"收入合同-关联");
+		wrapper.orderByAsc(SysLog::getCreateTime);
 		List<SysLog> sysLogs = sysLogMapper.selectList(wrapper);
 		List<JSONObject> jsonObjects = new ArrayList<>();
 		for (SysLog sysLog : sysLogs) {