Commit 12e03368 authored by 廖旭伟's avatar 廖旭伟

测试bug修改

parent afba51b4
...@@ -59,6 +59,7 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe ...@@ -59,6 +59,7 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
UserEntity userEntity = userMap.get(item.getCreateUserId()); UserEntity userEntity = userMap.get(item.getCreateUserId());
if(userEntity!=null) { if(userEntity!=null) {
item.setPhotoPath(userEntity.getPhotoPath()); item.setPhotoPath(userEntity.getPhotoPath());
item.setFeedbackName(userEntity.getRealName());
} }
} }
} }
......
...@@ -51,7 +51,7 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba ...@@ -51,7 +51,7 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
this.addDict(model, "feedbackType", paramService.getParamBySecondOrganize("Feedback","feedbackType")); this.addDict(model, "feedbackType", paramService.getParamBySecondOrganize("Feedback","feedbackType"));
this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("Feedback","processStatus")); this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("Feedback","processStatus"));
this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n))); this.addDict(model, "deptId", paramService.getParamBySecondOrganize("Feedback","deptId"));
super.init(model, context); super.init(model, context);
......
...@@ -73,8 +73,7 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic ...@@ -73,8 +73,7 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
this.addDict(model, "top", paramService.getParamBySecondOrganize("News", "top")); this.addDict(model, "top", paramService.getParamBySecondOrganize("News", "top"));
this.addDict(model, "viewNums", paramService.getParamBySecondOrganize("News", "viewNums")); this.addDict(model, "viewNums", paramService.getParamBySecondOrganize("News", "viewNums"));
this.addDict(model, "categoryId", newsCategoryService.find(new NewsCategoryQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n))); this.addDict(model, "categoryId", newsCategoryService.find(new NewsCategoryQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n))); this.addDict(model, "deptId", paramService.getParamBySecondOrganize("News","deptId"));
this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n))); this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
super.init(model, context); super.init(model, context);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment