diff --git a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java index 68f83a1..36f1dd8 100644 --- a/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java @@ -250,7 +250,6 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ List personPojos = responsiblePerService.selectByDepName(request.getDepartment()); List 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)) { diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java index 4fe36a5..4ddc34d 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java @@ -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; + } } diff --git a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java index 95ecc85..e5c1345 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java @@ -152,15 +152,20 @@ public class TodoTaskServiceImpl implements TodoTaskService { String currentProcessor = todoTaskPojo.getCurrentProcessor(); BeanUtils.copyProperties(todoTaskPojo, todoTaskPojo1); - List 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 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); }