问题修改
This commit is contained in:
parent
67de2f83ac
commit
ed2cdc3c49
@ -250,7 +250,6 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
|
|||||||
List<ResponsiblePerson> personPojos = responsiblePerService.selectByDepName(request.getDepartment());
|
List<ResponsiblePerson> personPojos = responsiblePerService.selectByDepName(request.getDepartment());
|
||||||
List<DataEntryEngineModelPojo> modelPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
|
List<DataEntryEngineModelPojo> modelPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
|
||||||
.eq("product_number", request.getProductNumber())
|
.eq("product_number", request.getProductNumber())
|
||||||
.eq("model_name", request.getModelName())
|
|
||||||
// .eq("brand", data.getBrand())
|
// .eq("brand", data.getBrand())
|
||||||
.doQuery(DataEntryEngineModelPojo.class);
|
.doQuery(DataEntryEngineModelPojo.class);
|
||||||
if (ObjectUtils.isNotEmpty(modelPojos)) {
|
if (ObjectUtils.isNotEmpty(modelPojos)) {
|
||||||
|
|||||||
@ -616,9 +616,12 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
if (ObjectUtils.isEmpty(parameterList)) {
|
||||||
|
return new ArrayList<>();
|
||||||
|
} else {
|
||||||
return parameterList;
|
return parameterList;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -152,7 +152,9 @@ public class TodoTaskServiceImpl implements TodoTaskService {
|
|||||||
String currentProcessor = todoTaskPojo.getCurrentProcessor();
|
String currentProcessor = todoTaskPojo.getCurrentProcessor();
|
||||||
BeanUtils.copyProperties(todoTaskPojo, todoTaskPojo1);
|
BeanUtils.copyProperties(todoTaskPojo, todoTaskPojo1);
|
||||||
|
|
||||||
List<String> strings = JSON.parseArray(currentProcessor).toList(String.class).stream()
|
List<String> strings = null;
|
||||||
|
try {
|
||||||
|
strings = JSON.parseArray(currentProcessor).toList(String.class).stream()
|
||||||
.map(x -> {
|
.map(x -> {
|
||||||
XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x);
|
XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x);
|
||||||
if (ObjectUtils.isNotEmpty(xdapUsers)) {
|
if (ObjectUtils.isNotEmpty(xdapUsers)) {
|
||||||
@ -161,6 +163,9 @@ public class TodoTaskServiceImpl implements TodoTaskService {
|
|||||||
return "未知用户名:" + x;
|
return "未知用户名:" + x;
|
||||||
}
|
}
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
} catch (Exception e) {
|
||||||
|
strings = Arrays.asList("解析失败 未知用户名:" + currentProcessor);
|
||||||
|
}
|
||||||
todoTaskPojo1.setCurrentProcessor(String.join(",", strings));
|
todoTaskPojo1.setCurrentProcessor(String.join(",", strings));
|
||||||
tods.add(todoTaskPojo1);
|
tods.add(todoTaskPojo1);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user