Merge remote-tracking branch 'origin/master'

zss

2024-07-18 4d7d9ee75f529c9e1d66f98608edf18221f76acd

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -8,7 +8,6 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.dto.DeviceDto1;
import com.yuanchu.mom.mapper.DeviceMapper;
import com.yuanchu.mom.mapper.StructureItemParameterMapper;
import com.yuanchu.mom.pojo.Device;
@@ -107,6 +106,11 @@
            String[] ids = device.getInsProductIds().split(",");
            for (String i : ids) {
                if (i.equals(id + "")) {
                    if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
                        device.setIsItADataAcquisitionDevice(false);
                    } else {
                        device.setIsItADataAcquisitionDevice(true);
                    }
                    devices2.add(device);
                    break;
                }