productDev/dmMes.git

			@@ -253,7 +253,7 @@
			userDeviceMapper.delete(new QueryWrapper<UserDevice>().eq("DEVICE_ID",deviceId));
			}
			if(StringUtils.isNotEmpty(userIds)){
			String [] ids=userIds.split(",");
			String [] ids=userIds.replace(" ","").split("[.,;，]");
			for (String id : ids) {
			CompanyUser companyUser = companyUserService.findById(Integer.valueOf(id));
			UserDevice userDevice = new UserDevice();
			@@ -365,7 +365,7 @@
			device.setFinishWarehouseLocationId(collect.get(s.getFinishWarehouseLocationName()).getId());
			deviceMapper.insert(device);
			if(StringUtils.isNotBlank(s.getUserIds())){
			this.dealDeviceUserId(Constants.ZERO,device.getUserIds(),device.getId(),user);
			this.dealDeviceUserId(Constants.ZERO,device.getUserIds().trim(),device.getId(),user);
			}

			});

			@@ -444,6 +444,7 @@
			left join unit d on a.UNIT_ID = d.ID
			left join procedures f on a.PROCEDURE_ID =f.ID
			where a.DELETED = 0
			and a.TYPE = 1
			<if test="rootDepartId != null">
			AND a.`ROOT_DEPART_ID` = #{rootDepartId}
			</if>

	server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/resources/mappers/WorkorderRecordExtMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史