|
|
@@ -234,7 +234,7 @@ public class KanbanInstanceServiceImpl extends BaseService<KanbanInstance> imple
|
|
|
*/
|
|
|
private void generateParameters(@NotEmpty("kanbanInstance") KanbanInstance kanbanInstance) {
|
|
|
Kanban kanban = checkKanban(kanbanInstance.getKanbanCode());
|
|
|
- Set<String> templateCodes = kanban.getTemplateCodes();
|
|
|
+ List<String> templateCodes = kanban.getTemplateCodes();
|
|
|
List<Template> templates = templateDao.findIn(templateCodes);
|
|
|
Map<String, List<TemplateParameter>> parameters = new HashMap<>();
|
|
|
List<GlobalParameter> globalParameters = new ArrayList<>();
|
|
|
@@ -306,14 +306,14 @@ public class KanbanInstanceServiceImpl extends BaseService<KanbanInstance> imple
|
|
|
throw new IllegalStateException("看板实例不存在");
|
|
|
}
|
|
|
Kanban kanban = checkKanban(kanbanInstance.getKanbanCode());
|
|
|
- Set<String> templateCodes = kanban.getTemplateCodes();
|
|
|
+ List<String> templateCodes = kanban.getTemplateCodes();
|
|
|
// 如果指定了模版,则解析该模版,否则解析该看板下的第一个模版
|
|
|
if (!StringUtils.isEmpty(templateCode)) {
|
|
|
- if (!templateCode.contains(templateCode)) {
|
|
|
+ if (!templateCodes.contains(templateCode)) {
|
|
|
throw new IllegalArgumentException("看板下未绑定该模版:" + templateCode);
|
|
|
}
|
|
|
} else {
|
|
|
- templateCode = templateCodes.iterator().next();
|
|
|
+ templateCode = templateCodes.get(0);
|
|
|
}
|
|
|
Template template = templateDao.findOne(templateCode);
|
|
|
Map<String, List<TemplateParameter>> parameters = kanbanInstance.getParameters();
|