Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

nidapeng

2024-03-20 c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25

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

@@ -286,7 +286,9 @@
        MPJLambdaWrapper<Solutions> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Solutions.class);
        queryWrapper.selectAs(Insurance::getName,Solutions::getInsuranceName);
        queryWrapper.selectAs(Company::getName,Solutions::getShopName);
        queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId);
        queryWrapper.leftJoin(Company.class,Company::getId,Solutions::getShopId);
        queryWrapper.eq(Solutions::getId,id);
        Solutions model = solutionsJoinMapper.selectJoinOne(Solutions.class,queryWrapper);
        if(model == null  || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
@@ -331,8 +333,13 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.selectAll(Solutions.class);
        queryWrapper.selectAs(Insurance::getName,Solutions::getInsuranceName);
        queryWrapper.selectAs(Company::getName,Solutions::getShopName);
        queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId);

        queryWrapper.leftJoin(Company.class,Company::getId,Solutions::getShopId);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(user.getType().equals(Constants.ONE)){
            queryWrapper.exists(("select 1 from company_solution b where b.isdeleted=0 and b.company_id="+user.getCompanyId()+" and b.SOLUTION_BASE_ID = t.id"));
        }
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.eq(Solutions::getId, pageWrap.getModel().getId());
        }