doum
2026-05-26 f4d592f3626f94117d8a4eb22176a28290931980
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwElectricalServiceImpl.java
@@ -20,6 +20,7 @@
import com.doumee.dao.business.model.DeviceData;
import com.doumee.dao.business.model.YwDevice;
import com.doumee.dao.business.model.YwElectrical;
import com.doumee.dao.business.model.YwElectricalParam;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwElectricalMapper;
import com.doumee.service.business.YwElectricalBizService;
@@ -130,7 +131,12 @@
        IPage<YwElectrical> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<YwElectrical> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.eq(YwElectrical::getIsdeleted, Constants.ZERO);
        queryWrapper.selectAll(YwElectrical.class)
                .selectAs(YwElectricalParam::getName, YwElectrical::getParamName)
                .leftJoin(YwElectricalParam.class, on -> on
                        .eq(YwElectricalParam::getId, YwElectrical::getElectricalParamId)
                        .eq(YwElectricalParam::getIsdeleted, Constants.ZERO))
                .eq(YwElectrical::getIsdeleted, Constants.ZERO);
        if (StringUtils.isNotBlank(pageWrap.getModel().getMeterKeyword())) {
            String kw = pageWrap.getModel().getMeterKeyword().trim();
            queryWrapper.and(w -> w.like(YwElectrical::getName, kw).or().like(YwElectrical::getAddress, kw));