git ch

k94314517

2024-04-03 77f12a8d0375087db4ba68fba26825ddc7bd183e

 server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java

@@ -294,7 +294,7 @@
    @Override
    public Integer merge(SaveUnionChangeDTO saveUnionChangeDTO){
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(user.getType().equals(Constants.TWO)){
        if(!user.getType().equals(Constants.TWO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非商户用户，无法进行该操作");
        }
        if(Objects.isNull(saveUnionChangeDTO)
@@ -311,7 +311,7 @@
                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                        .eq(ApplyChange::getIsdeleted, Constants.ZERO)
                        .eq(InsuranceApply::getUnionApplyId,saveUnionChangeDTO.getUnionApplyId())
                        .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.COMPANY_SIGN.getKey())
                        .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
                        .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                        .eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType())
                        .in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds())
@@ -392,7 +392,7 @@
                .set(ApplyChange::getUnionChangeId,null)
                .set(ApplyChange::getCheckDate,new Date())
                .set(ApplyChange::getCheckUserId,user.getId())
                .set(ApplyChange::getStatus,Constants.ApplyChangeStatus.COMPANY_SIGN.getKey())
                .set(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
                .in(ApplyChange::getUnionChangeId,unionChange.getId())
        );