合并服务单订单改造分支

Helius

2022-05-24 560228ac3c15cccce0b2a5994d44e4e81b5b3b73

 zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java

@@ -1,19 +1,12 @@
package com.matrix.system.common.service;

import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.score.constant.ScoreSettingConstant;
import com.matrix.system.enums.BooleanEnum;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

@Service
@@ -31,7 +24,8 @@
        return (
                Objects.nonNull(busParameterSettings)
                && StringUtils.isNotBlank(busParameterSettings.getParamValue())
                && AppConstance.IS_Y.equals(busParameterSettings.getParamValue())
//                && AppConstance.IS_Y.equals(busParameterSettings.getParamValue())
                && BooleanEnum.TRUE.getValue() == busParameterSettings.getIntParamValue()
                );
    }