|
|
@@ -374,6 +374,7 @@ public class AppUserController extends BaseApiController {
|
|
|
res.setData(demandService.selectDemandDetail( id));
|
|
|
return res;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 新增成果
|
|
|
*/
|
|
|
@@ -382,14 +383,18 @@ public class AppUserController extends BaseApiController {
|
|
|
private Result appAddAchievement(@Valid InputAchievement ia, BindingResult bindingResult,
|
|
|
String keyword1,String keyword2,String keyword3) {
|
|
|
Result res = new Result();
|
|
|
- String[] keywords ;
|
|
|
- if (StringUtils.isNotEmpty(keyword3)) {
|
|
|
- keywords=new String[]{keyword1,keyword2};
|
|
|
- }else if (StringUtils.isNotEmpty(keyword2)) {
|
|
|
- keywords=new String[]{keyword1};
|
|
|
- }else {
|
|
|
- keywords=new String[]{keyword1,keyword2,keyword3};
|
|
|
+ List<String> keyword=new ArrayList<>();
|
|
|
+ if (!StringUtils.isBlank(keyword1)) {
|
|
|
+ keyword.add(keyword1);
|
|
|
+ }
|
|
|
+ if (!StringUtils.isBlank(keyword2)) {
|
|
|
+ keyword.add(keyword2);
|
|
|
+ }
|
|
|
+ if (!StringUtils.isBlank(keyword3)) {
|
|
|
+ keyword.add(keyword3);
|
|
|
}
|
|
|
+ String[] keywords=(String[])keyword.toArray(new String[keyword.size()]);
|
|
|
+ System.out.println(StringUtils.join(keywords,","));
|
|
|
ia.setKeyword(StringUtils.join(keywords,","));
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|