操作日志

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -1000,16 +1000,15 @@ public class ContractServiceImpl implements ContractService {
     @Override
     public List<Contract> findAll(User loginAccount, String startDate, String endDate, String platform, String contractId) {
         List<Contract> result = new ArrayList<>();
-        List<User> sales = userRepository.findAll();
+
+        List<Sales> salesList = salesRepository.findAllByStatusOn();
         Map<Long, String> saleMap = new HashMap<>();
-        if (ValidateUtil.isValid(sales)) {
-            for (User s : sales) {
+        if (ValidateUtil.isValid(salesList)) {
+            for (Sales s : salesList) {
                 saleMap.put(s.getId(), s.getName());
             }
         }
 
-
-
         List<PackageType> typeList = packageTypeRepository.findAll();
         Map<Long, String> typeMap = new HashMap<>();
         if (ValidateUtil.isValid(typeList)) {
@@ -1364,6 +1363,7 @@ public class ContractServiceImpl implements ContractService {
             ChangeDelInfo changeDelInfo = new ChangeDelInfo();
             changeDelInfo.setContractCode(contractMoney.getContractCode());
             changeDelInfo.setEmail(contractMoney.getEmail());
+            changeDelInfo.setSourceId(contractMoney.getId());
 
             if("pay".equals(contractMoney.getType())){