From 16c14e07a13fa1f2e2cba0f4e33acef8e7d5670e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:27:26 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index a7ca3b0..c29e035 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -2677,7 +2677,6 @@
                 throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟鏁版嵁");
             }
             SaveUnionChangeDTO saveUnionChangeDTO = new SaveUnionChangeDTO();
-//            saveUnionChangeDTO.setApplyDate(update.getApplyStartTime());
             saveUnionChangeDTO.setApplyDate(model.getValidTime());
             List<Integer> applyIds = new ArrayList<>();
             applyIds.add(model.getId());
@@ -2685,27 +2684,21 @@
             saveUnionChangeDTO.setApplyChange(model);
             saveUnionChangeDTO.setUnionApplyId(insuranceApply.getUnionApplyId());
             saveUnionChangeDTO.setBusinessType(model.getType());
-//            if(Constants.equalsInteger(model.getType(),Constants.ONE)){
-//            }
             if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                 saveUnionChangeDTO.setShopId(user.getCompanyId());
             }else{
-                CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda().eq(CompanySolution::getSolutionId,solutions.getId()).eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId()).last(" limit 1 "));
+                CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>()
+                        .lambda().eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
+                        .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId()).last(" limit 1 "));
                 if(Objects.isNull(companySolution)){
                     throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鏂规淇℃伅");
                 }
                 saveUnionChangeDTO.setShopId(companySolution.getShopId());
 
             }
-//            if(1==1){
-//                throw new BusinessException(ResponseStatus.DATA_EMPTY);
-//            }
 
             unionChangeService.merge(saveUnionChangeDTO);
         }
-//        if(1==1){
-//            throw new BusinessException(ResponseStatus.DATA_EMPTY);
-//        }
         return  1;
 
     }

--
Gitblit v1.9.3