productDev/dmMes.git

DM云工厂标准版

Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

jiangping

2023-08-28 d0323f5d8009b38ae89ab4da304da47de6df792e

Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

已修改1个文件

server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java

2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史

 server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java

@@ -241,7 +241,7 @@
        queryDeviceExtDTO1.setRootDepartId(user.getRootDepartment().getId());
        List<DeviceExtListVO> list1= deviceExtService.getListByCondition(queryDeviceExtDTO1);*/
        if(list.size()>0){
            return ApiResponse.failed("设备编码，不允许添加");
            return ApiResponse.failed("设备编码已存在，不允许添加");
        }
        device.setDeleted(Constants.ZERO);
        device.setCreateTime(new Date());

			@@ -241,7 +241,7 @@
			queryDeviceExtDTO1.setRootDepartId(user.getRootDepartment().getId());
			List<DeviceExtListVO> list1= deviceExtService.getListByCondition(queryDeviceExtDTO1);*/
			if(list.size()>0){
			return ApiResponse.failed("设备编码，不允许添加");
			return ApiResponse.failed("设备编码已存在，不允许添加");
			}
			device.setDeleted(Constants.ZERO);
			device.setCreateTime(new Date());