|
@@ -1,5 +1,6 @@
|
|
|
package com.huaxu.order.controller;
|
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -78,7 +79,7 @@ public class WorkOrderManageController {
|
|
|
@Value("${UMIS.sys_video_path}")
|
|
|
private String videoDir;
|
|
|
|
|
|
- /**
|
|
|
+ /**select
|
|
|
* 新增一条数据
|
|
|
*
|
|
|
* @param workOrderManage 实体类
|
|
@@ -861,25 +862,29 @@ public class WorkOrderManageController {
|
|
|
try{
|
|
|
List<Long> idList = new ArrayList<Long>();
|
|
|
for(WorkOrderManageDto workOrder:result) {
|
|
|
- if(workOrder.getSendBy()!=null) {
|
|
|
- idList.add(Long.valueOf(workOrder.getSendBy()));
|
|
|
- }
|
|
|
- if(workOrder.getOrderUserId()!=null) {
|
|
|
- idList.add(Long.valueOf(workOrder.getOrderUserId()));
|
|
|
- }
|
|
|
- if(workOrder.getCreateBy()!=null) {
|
|
|
- idList.add(Long.valueOf(workOrder.getCreateBy()));
|
|
|
- }
|
|
|
- if(workOrder.getUpdateBy()!=null) {
|
|
|
- idList.add(Long.valueOf(workOrder.getUpdateBy()));
|
|
|
- }
|
|
|
- if(workOrder.getCurrentUsers() != null) {
|
|
|
- String[] currentUserIds = workOrder.getCurrentUsers().split(",");
|
|
|
- for(String currentUserId:currentUserIds){
|
|
|
- if(!StringUtils.isEmpty(currentUserId)) {
|
|
|
- idList.add(Long.valueOf(currentUserId));
|
|
|
+ try {
|
|
|
+ if (workOrder.getSendBy() != null) {
|
|
|
+ idList.add(Long.valueOf(workOrder.getSendBy()));
|
|
|
+ }
|
|
|
+ if (workOrder.getOrderUserId() != null) {
|
|
|
+ idList.add(Long.valueOf(workOrder.getOrderUserId()));
|
|
|
+ }
|
|
|
+ if (workOrder.getCreateBy() != null) {
|
|
|
+ idList.add(Long.valueOf(workOrder.getCreateBy()));
|
|
|
+ }
|
|
|
+ if (workOrder.getUpdateBy() != null) {
|
|
|
+ idList.add(Long.valueOf(workOrder.getUpdateBy()));
|
|
|
+ }
|
|
|
+ if (workOrder.getCurrentUsers() != null) {
|
|
|
+ String[] currentUserIds = workOrder.getCurrentUsers().split(",");
|
|
|
+ for (String currentUserId : currentUserIds) {
|
|
|
+ if (!StringUtils.isEmpty(currentUserId)) {
|
|
|
+ idList.add(Long.valueOf(currentUserId));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ }catch (Exception e){
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
Long[] ids = idList.toArray(new Long[0]);
|