productDev/funingyunwei.git

			@@ -125,6 +125,7 @@
			.selectAs(SystemUser::getMobile,YwDeviceRecord::getMobile)
			.selectAs(Company::getName,YwDeviceRecord::getCompanyName)
			.selectAs(YwDevice::getName,YwDeviceRecord::getDeviceName)
			.selectAs(YwDevice::getCode,YwDeviceRecord::getDeviceCode)
			.leftJoin(SystemUser.class,SystemUser::getId,YwDeviceRecord::getUserId)
			.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
			.leftJoin(YwDevice.class,YwDevice::getId,YwDeviceRecord::getDeviceId)
			@@ -132,7 +133,7 @@
			.last(" limit 1 ")
			);
			List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
			.eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.FN_DEVICE_RECORD_FILE));
			.eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.FN_DEVICE_RECORD_FILE.getKey()));
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifiles)) {
			String path = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode()
			+ systemDictDataBiz.queryByCode(Constants.FTP, Constants.YW_DEVICE).getCode();
			@@ -174,6 +175,7 @@
			.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
			.leftJoin(YwDevice.class,YwDevice::getId,YwDeviceRecord::getDeviceId)
			.eq(YwDeviceRecord::getIsdeleted,Constants.ZERO)
			.eq(Objects.nonNull(model.getUserId()),YwDeviceRecord::getUserId,model.getUserId())
			.and(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getDeviceName()),i->i.like(YwDevice::getName,model.getDeviceName()).or().like(YwDevice::getCode,model.getDeviceName()))
			.ge(Objects.nonNull(model.getStartDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
			.le(Objects.nonNull(model.getEndDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))