..

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

@@ -2,6 +2,7 @@ package io.renren.modules.admin.controller;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -38,10 +39,9 @@ public class MeetingController {
     */
    @GetMapping("/list")
    @RequiresPermissions("admin:meeting:list")
    public R list(@RequestParam Map<String, Object> params){
        PageUtils page = meetingService.queryPage(params);
        return R.ok().put("page", page);
    public R list(){
        List<MeetingEntity> list= meetingService.listByPid(0L);
        return R.ok().put("list", list);
    }
    /**

src/main/java/io/renren/modules/admin/entity/MeetingEntity.java

@@ -38,9 +38,13 @@ public class MeetingEntity implements Serializable {
     */
    private String address;
    /**
     * 时间
     * 开始时间
     */
    private String time;
    private String startTime;
    /**
     * 结束时间
     */
    private String endTime;
    /**
     * 封面图片
     */

src/main/java/io/renren/modules/admin/service/MeetingService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.entity.MeetingEntity;
import java.util.List;
import java.util.Map;
/**
@@ -18,5 +19,7 @@ public interface MeetingService extends IService<MeetingEntity> {
    PageUtils queryPage(Map<String, Object> params);
    boolean meetingExist(Long id);
	List<MeetingEntity> listByPid(Long pid);
}

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

@@ -2,6 +2,8 @@ package io.renren.modules.admin.service.impl;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,7 +15,6 @@ import io.renren.modules.admin.dao.MeetingDao;
import io.renren.modules.admin.entity.MeetingEntity;
import io.renren.modules.admin.service.MeetingService;
@Service("meetingService")
public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> implements MeetingService {
@@ -21,12 +22,9 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
    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>().eq("is_del", 0)
                .eq(meetingId != 0L, "pid", meetingId)
                .like(StringUtils.isNotBlank(key),"name", key)
        );
        IPage<MeetingEntity> page = this.page(new Query<MeetingEntity>().getPage(params),
                new QueryWrapper<MeetingEntity>().eq("is_del", 0).eq(meetingId != 0L, "pid", meetingId)
                        .like(StringUtils.isNotBlank(key), "name", key));
        return new PageUtils(page);
    }
@@ -35,7 +33,12 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
    public boolean meetingExist(Long id) {
        MeetingEntity meeting = getOne(new QueryWrapper<MeetingEntity>().eq("id", id).eq("pid", 0).eq("is_del", 0));
        return meeting==null ? false : true;
        return meeting == null ? false : true;
    }
    @Override
    public List<MeetingEntity> listByPid(Long pid) {
        return this.list(new QueryWrapper<MeetingEntity>().eq("is_del", 0).eq("pid", pid));
    }
}

src/main/java/io/renren/modules/sys/controller/SysMenuController.java

@@ -46,31 +46,6 @@ public class SysMenuController extends AbstractController {
		return R.ok().put("menuList", menuList).put("permissions", permissions);
	}
	
	@GetMapping("/mynav")
	public R mynav(){
		Long meetingMenuId = 76L;
		List<SysMenuEntity> meetingMenuList = sysMenuService.getUserMenuList(getUserId(), meetingMenuId);
		List<SysMenuEntity> noMeetingMenuList = sysMenuService.getUserNotParentIdMenuList(getUserId(), meetingMenuId);
		Set<String> permissions = shiroService.getUserPermissions(getUserId());
		return R.ok().put("meetingMenuList", meetingMenuList).put("noMeetingMenuList", noMeetingMenuList).put("permissions", permissions);
	}
	@GetMapping("/nomeetingnav")
	public R nomeetingnav() {
		Long meetingMenuId = 76L;
		List<SysMenuEntity> meetingMenuList = sysMenuService.getUserMenuList(getUserId(), meetingMenuId);
		Set<String> permissions = shiroService.getUserPermissions(getUserId());
		return R.ok().put("menuList", meetingMenuList).put("permissions", permissions);
	}
	@GetMapping("/meetingnav")
	public R meetingnav() {
		Long meetingMenuId = 76L;
		List<SysMenuEntity> noMeetingMenuList = sysMenuService.getUserNotParentIdMenuList(getUserId(), meetingMenuId);
		Set<String> permissions = shiroService.getUserPermissions(getUserId());
		return R.ok().put("menuList", noMeetingMenuList).put("permissions", permissions);
	}
	/**
	 * 所有菜单列表
	 */

src/main/java/io/renren/modules/sys/entity/SysMenuEntity.java

@@ -72,6 +72,10 @@ public class SysMenuEntity implements Serializable {
	 * 排序
	 */
	private Integer orderNum;
	/**
	 * 是否为会议目录
	 */
	private Integer me;
	
	/**
	 * ztree属性