..

src/main/java/io/renren/modules/admin/controller/MeetingController.java

@@ -6,7 +6,9 @@ import java.util.Map;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -34,7 +36,7 @@ public class MeetingController {
    /**
     * 列表
     */
    @RequestMapping("/list")
    @GetMapping("/list")
    @RequiresPermissions("admin:meeting:list")
    public R list(@RequestParam Map<String, Object> params){
        PageUtils page = meetingService.queryPage(params);
@@ -45,7 +47,7 @@ public class MeetingController {
    /**
     * 信息
     */
    @RequestMapping("/info/{id}")
    @GetMapping("/info/{id}")
    @RequiresPermissions("admin:meeting:info")
    public R info(@PathVariable("id") Long id){
		MeetingEntity meeting = meetingService.getById(id);
@@ -56,7 +58,7 @@ public class MeetingController {
    /**
     * 保存
     */
    @RequestMapping("/save")
    @PostMapping("/save")
    @RequiresPermissions("admin:meeting:save")
    public R save(@RequestBody MeetingEntity meeting){
        meeting.setCreateTime(new Date());
@@ -68,7 +70,7 @@ public class MeetingController {
    /**
     * 修改
     */
    @RequestMapping("/update")
    @PostMapping("/update")
    @RequiresPermissions("admin:meeting:update")
    public R update(@RequestBody MeetingEntity meeting){
        meeting.setModifyTime(new Date());
@@ -80,7 +82,7 @@ public class MeetingController {
    /**
     * 删除
     */
    @RequestMapping("/delete")
    @PostMapping("/delete")
    @RequiresPermissions("admin:meeting:delete")
    public R delete(@RequestBody Long[] ids){
		meetingService.removeByIds(Arrays.asList(ids));
@@ -88,4 +90,34 @@ public class MeetingController {
        return R.ok();
    }
    /**
     * 列表
     */
    @GetMapping("/listbranch")
    @RequiresPermissions("admin:meeting:list")
    public R listBranch(@RequestParam Map<String, Object> params){
        if (!params.containsKey("meetingId")){
            return R.error("会议id不能为空");
        }
        
        PageUtils page = meetingService.queryPage(params);
        return R.ok().put("page", page);
    }
    /**
     * 保存分会
     */
    @PostMapping("/savebranch")
    @RequiresPermissions("admin:meeting:save")
    public R saveBranch(@RequestBody MeetingEntity meeting){
        if (meeting.getPid()==0L) {
            return R.error("会议父id(pid)不能为空");
        }
        meeting.setCreateTime(new Date());
		meetingService.save(meeting);
        return R.ok();
    }
}

src/main/java/io/renren/modules/admin/service/impl/MeetingServiceImpl.java

@@ -20,11 +20,12 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String key = params.containsKey("key") ? (String) params.get("key") : null;
        Long meetingId = params.containsKey("meetingId") ? Long.valueOf(params.get("meetingId").toString()) : 0L;
        IPage<MeetingEntity> page = this.page(
                new Query<MeetingEntity>().getPage(params),
                new QueryWrapper<MeetingEntity>()
                new QueryWrapper<MeetingEntity>().eq("is_del", 0)
                .eq(meetingId != 0L, "pid", meetingId)
                .like(StringUtils.isNotBlank(key),"name", key)
				.eq("is_del", 0)
        );
        return new PageUtils(page);