|
@ -50,7 +50,7 @@ public class MeetingController {
|
50
|
50
|
@GetMapping("/info/{id}")
|
51
|
51
|
@RequiresPermissions("admin:meeting:info")
|
52
|
52
|
public R info(@PathVariable("id") Long id){
|
53
|
|
MeetingEntity meeting = meetingService.getById(id);
|
|
53
|
MeetingEntity meeting = meetingService.getById(id);
|
54
|
54
|
|
55
|
55
|
return R.ok().put("meeting", meeting);
|
56
|
56
|
}
|
|
@ -62,7 +62,7 @@ public class MeetingController {
|
62
|
62
|
@RequiresPermissions("admin:meeting:save")
|
63
|
63
|
public R save(@RequestBody MeetingEntity meeting){
|
64
|
64
|
meeting.setCreateTime(new Date());
|
65
|
|
meetingService.save(meeting);
|
|
65
|
meetingService.save(meeting);
|
66
|
66
|
|
67
|
67
|
return R.ok();
|
68
|
68
|
}
|
|
@ -74,7 +74,7 @@ public class MeetingController {
|
74
|
74
|
@RequiresPermissions("admin:meeting:update")
|
75
|
75
|
public R update(@RequestBody MeetingEntity meeting){
|
76
|
76
|
meeting.setModifyTime(new Date());
|
77
|
|
meetingService.updateById(meeting);
|
|
77
|
meetingService.updateById(meeting);
|
78
|
78
|
|
79
|
79
|
return R.ok();
|
80
|
80
|
}
|
|
@ -85,7 +85,7 @@ public class MeetingController {
|
85
|
85
|
@PostMapping("/delete")
|
86
|
86
|
@RequiresPermissions("admin:meeting:delete")
|
87
|
87
|
public R delete(@RequestBody Long[] ids){
|
88
|
|
meetingService.removeByIds(Arrays.asList(ids));
|
|
88
|
meetingService.removeByIds(Arrays.asList(ids));
|
89
|
89
|
|
90
|
90
|
return R.ok();
|
91
|
91
|
}
|
|
@ -111,12 +111,12 @@ public class MeetingController {
|
111
|
111
|
@PostMapping("/savebranch")
|
112
|
112
|
@RequiresPermissions("admin:meeting:save")
|
113
|
113
|
public R saveBranch(@RequestBody MeetingEntity meeting){
|
114
|
|
if (meeting.getPid()==0L) {
|
115
|
|
return R.error("会议父id(pid)不能为空");
|
|
114
|
if (meeting.getPid()==null || meeting.getPid()==0L) {
|
|
115
|
return R.error("会议父id(pid)不能为空或0");
|
116
|
116
|
}
|
117
|
117
|
|
118
|
118
|
meeting.setCreateTime(new Date());
|
119
|
|
meetingService.save(meeting);
|
|
119
|
meetingService.save(meeting);
|
120
|
120
|
|
121
|
121
|
return R.ok();
|
122
|
122
|
}
|