productDev/dmvisit.git

			@@ -3,6 +3,7 @@
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.doumee.core.model.PageData;
			import com.doumee.core.model.PageWrap;
			import com.doumee.core.utils.Constants;
			import com.doumee.core.utils.Utils;
			import com.doumee.dao.business.DeviceMapper;
			import com.doumee.dao.business.model.Device;
			@@ -90,11 +91,9 @@
			public List<Device> findIdAndNameList(Device param) {
			LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(param);
			wrapper.select(Device::getId, Device::getName, Device::getDoorName,Device::getRegionPathName, Device::getRegionName);
			if(null != param.getType() && null != param.getIsdeleted() && null != param.getHkStatus()) {
			wrapper.eq(Device::getType,param.getType())
			.eq(Device::getIsdeleted,param.getIsdeleted())
			.eq(Device::getHkStatus,param.getHkStatus());
			}
			wrapper.eq(null != param.getType(),Device::getType,param.getType())
			.eq(null !=param.getIsdeleted(),Device::getIsdeleted,param.getIsdeleted())
			.eq(null != param.getHkStatus(),Device::getHkStatus,param.getHkStatus());
			return deviceMapper.selectList(wrapper);
			}

			@@ -102,6 +101,7 @@
			public PageData<Device> findPage(PageWrap<Device> pageWrap) {
			IPage<Device> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
			pageWrap.getModel().setIsdeleted(Constants.ZERO);
			Utils.MP.blankToNull(pageWrap.getModel());
			if (pageWrap.getModel().getId() != null) {
			queryWrapper.lambda().eq(Device::getId, pageWrap.getModel().getId());