From 68848209fb33f4f2bd32ce60fd394531221d2773 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 25 八月 2023 18:16:56 +0800
Subject: [PATCH] # 企业端用户
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 16 ++++++++--------
server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index fb651b8..849381b 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -330,14 +330,14 @@
if(Objects.isNull(procedures)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸ュ簭鍚嶇О涓嶅瓨鍦�");
}
- QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
- queryDeviceExtDTO.setDeleted(Constants.ZERO);
- queryDeviceExtDTO.setCode(s.getDeviceCode());
- queryDeviceExtDTO.setRootDepartId(user.getRootDepartment().getId());
- List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
- if(list.size() > 0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璁惧缂栫爜涓嶅瓨鍦�");
- }
+// QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
+// queryDeviceExtDTO.setDeleted(Constants.ZERO);
+// queryDeviceExtDTO.setCode(s.getDeviceCode());
+// queryDeviceExtDTO.setRootDepartId(user.getRootDepartment().getId());
+// List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
+// if(list.size() > 0){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璁惧缂栫爜涓嶅瓨鍦�");
+// }
diff --git a/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
index 01a18aa..8bbce31 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
@@ -232,7 +232,7 @@
Bom bom = bomList.get(Constants.ZERO);
List<Procedures> proceduresList = proceduresMapper.selectList(
new QueryWrapper<Procedures>().apply(" id in ( select r.PROCEDURE_ID from route_procedure r where r.ROUTE_ID = '"+bom.getRouteId()+"' order by r.SORTNUM ) ")
- .orderByAsc( " SORTNUM ")
+
);
return proceduresList;
}
--
Gitblit v1.9.3