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/CompanySolutionServiceImpl.java

@@ -6,6 +6,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CompanySolutionMapper;
import com.doumee.dao.business.join.CompanySolutionJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanySolution;
import com.doumee.dao.business.model.Solutions;
import com.doumee.service.business.CompanySolutionService;
@@ -88,7 +89,9 @@
        MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>();
        csWrapper.selectAll(CompanySolution.class);
        csWrapper.selectAs(Solutions::getName,CompanySolution::getSolutionName);
        csWrapper.selectAs(Company::getName,CompanySolution::getShopName);
        csWrapper.leftJoin(Solutions.class,Solutions::getId,CompanySolution::getSolutionBaseId);
        csWrapper.leftJoin(Company.class, Company::getId,CompanySolution::getShopId);
        csWrapper.eq(CompanySolution::getCompanyId,companySolution.getCompanyId());
        csWrapper.eq(CompanySolution::getIsdeleted, Constants.ZERO);
        csWrapper.eq(Solutions::getIsdeleted, Constants.ZERO);