问题修改
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<DataEntryEngineModelPojo> modelPojos = sw.buildFromDatasource("xdap_app_223770822127386625")
|
||||
.eq("product_number", request.getProductNumber())
|
||||
.eq("model_name", request.getModelName())
|
||||
// .eq("brand", data.getBrand())
|
||||
.doQuery(DataEntryEngineModelPojo.class);
|
||||
if (ObjectUtils.isNotEmpty(modelPojos)) {
|
||||
|
||||
@ -616,8 +616,11 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
|
||||
return true;
|
||||
}
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
return parameterList;
|
||||
if (ObjectUtils.isEmpty(parameterList)) {
|
||||
return new ArrayList<>();
|
||||
} else {
|
||||
return parameterList;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -152,15 +152,20 @@ public class TodoTaskServiceImpl implements TodoTaskService {
|
||||
String currentProcessor = todoTaskPojo.getCurrentProcessor();
|
||||
BeanUtils.copyProperties(todoTaskPojo, todoTaskPojo1);
|
||||
|
||||
List<String> strings = JSON.parseArray(currentProcessor).toList(String.class).stream()
|
||||
.map(x -> {
|
||||
XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x);
|
||||
if (ObjectUtils.isNotEmpty(xdapUsers)) {
|
||||
return xdapUsers.getUsername();
|
||||
} else {
|
||||
return "未知用户名:" + x;
|
||||
}
|
||||
}).collect(Collectors.toList());
|
||||
List<String> strings = null;
|
||||
try {
|
||||
strings = JSON.parseArray(currentProcessor).toList(String.class).stream()
|
||||
.map(x -> {
|
||||
XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(x);
|
||||
if (ObjectUtils.isNotEmpty(xdapUsers)) {
|
||||
return xdapUsers.getUsername();
|
||||
} else {
|
||||
return "未知用户名:" + x;
|
||||
}
|
||||
}).collect(Collectors.toList());
|
||||
} catch (Exception e) {
|
||||
strings = Arrays.asList("解析失败 未知用户名:" + currentProcessor);
|
||||
}
|
||||
todoTaskPojo1.setCurrentProcessor(String.join(",", strings));
|
||||
tods.add(todoTaskPojo1);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user