diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index f6443039..6b54cc6d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -4,57 +4,31 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.common.api.vo.Result;
 import com.jero.common.common.ProjectCommon;
-import com.jero.common.common.RoleCommon;
-import com.jero.common.dto.SendMessageDTO;
-import com.jero.common.enums.CompanyMessageEnums;
-import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.service.ProjectDetailService;
-import com.jero.common.service.SendMessageService;
-import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.PasswordUtil;
 import com.jero.common.vo.ProjectStatusVO;
-import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.contract.entity.PayIncomeContract;
-import com.jero.contract.entity.PayIncomeContractAssociated;
-import com.jero.contract.service.IPayIncomeContractAssociatedService;
 import com.jero.contract.service.IPayIncomeContractService;
-import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.system.entity.SysUser;
-import com.jero.modules.system.service.ISysRoleService;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.pack.entity.PayPackCompany;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
-import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.project.common.PayProjectCommon;
-import com.jero.project.entity.PayWorkGroupSubletStatistics;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.mapper.PayCommonProjectMapper;
-import com.jero.project.vo.PayCommonProjectOutput;
-import com.jero.statistics.entity.AllProjectStatistics;
-import com.jero.statistics.entity.AllProjectStatisticsSearch;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
-import java.lang.reflect.Array;
 import java.util.*;
 
 /**
@@ -69,21 +43,21 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
 
     @Resource
     private PayCommonProjectMapper payCommonProjectMapper;
-    @Autowired
+    @Resource
     private IPayCommonProjectService payCommonProjectService;
-    @Autowired
+    @Resource
     private ISysUserService sysUserService;
-    @Autowired
+    @Resource
     private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayIncomeContractService payIncomeContractService;
-    @Autowired
+    @Resource
     private IPayPackCompanyProjectService payPackCompanyProjectService;
-    @Autowired
+    @Resource
     private ProjectDetailService projectDetailService;
-    @Autowired
+    @Resource
     private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
 
 
@@ -210,6 +184,24 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
             }
         }
         payCommonProjectService.updateById(payCommonProject);
+        LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
+        updatePayCommonProject.eq(PayCommonProject::getId,payCommonProject.getId());
+        // 选择无
+        if(Objects.equals(payCommonProject.getChargeWay(),PayProjectCommon.CHARGE_WAY1)){
+            updatePayCommonProject.set(PayCommonProject::getContractNum,null);
+            updatePayCommonProject.set(PayCommonProject::getChargeNoticeNo,null);
+            updatePayCommonProject.set(PayCommonProject::getChargeNoticeId,null);
+        }
+        // 选择合同
+        if(Objects.equals(payCommonProject.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
+            updatePayCommonProject.set(PayCommonProject::getChargeNoticeNo,null);
+            updatePayCommonProject.set(PayCommonProject::getChargeNoticeId,null);
+        }
+        // 选择收费通知
+        if(Objects.equals(payCommonProject.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){
+            updatePayCommonProject.set(PayCommonProject::getContractNum,null);
+        }
+        payCommonProjectService.update(updatePayCommonProject);
     }
 
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index af35346f..1f664b3b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -267,6 +267,27 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             }
         }
         payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
+        LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
+        updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,payWorkingGroupSubItem.getId());
+        // 选择无
+        if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY1)){
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getReceivableAmount,null);
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,null);
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,null);
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,null);
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeId,null);
+        }
+        // 选择合同
+        if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,null);
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,null);
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeId,null);
+        }
+        // 选择收费通知
+        if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){
+            updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,null);
+        }
+        payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
     }
 
     @Override