菜单权限、bug修改

src/main/java/io/renren/modules/app/entity/HPzEntity.java

@@ -195,6 +195,11 @@ public class HPzEntity implements Serializable {
     @ApiModelProperty("结束凭证号")
     private int endpzh;
 
+    @ApiModelProperty("开始会计日期")
+    private String beginpzrq;
+    @ApiModelProperty("结束会计日期")
+    private String endpzrq;
+
     @ApiModelProperty("用户id")
     private String id;
 

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

@@ -9,12 +9,15 @@ import io.renren.common.validator.ValidatorUtils;
 import io.renren.common.validator.group.AddGroup;
 import io.renren.common.validator.group.UpdateGroup;
 import io.renren.modules.app.entity.YwpzEntity;
+import io.renren.modules.sys.entity.SysRoleEntity;
 import io.renren.modules.sys.entity.SysUserEntity;
 import io.renren.modules.sys.form.PasswordForm;
+import io.renren.modules.sys.service.SysRoleService;
 import io.renren.modules.sys.service.SysUserRoleService;
 import io.renren.modules.sys.service.SysUserService;
 import io.swagger.annotations.ApiOperation;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -41,6 +44,9 @@ public class SysUserController extends AbstractController {
 	@Autowired
 	private SysUserRoleService sysUserRoleService;
 
+	@Autowired
+	private SysRoleService roleService;
+
 	/**
 	 * 所有用户列表
 	 */
@@ -61,7 +67,16 @@ public class SysUserController extends AbstractController {
 	 */
 	@GetMapping("/info")
 	public R info() {
-		return R.ok().put("user", getUser());
+		R ok = R.ok();
+		SysUserEntity user = getUser();
+		ok.put("user", user);
+		List<Long> roleIdList = sysUserRoleService.queryRoleIdList(user.getUserId());
+		if (CollectionUtils.isNotEmpty(roleIdList))
+		{
+			List<SysRoleEntity> sysRoleEntities = roleService.selectBatchIds(roleIdList);
+			ok.put("roles", sysRoleEntities);
+		}
+		return ok;
 	}
 
 	/**

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

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -33,7 +34,7 @@ import java.util.List;
  * @date 2016年9月18日 上午9:26:39
  */
 @TableName("sys_menu")
-public class SysMenuEntity implements Serializable {
+public class SysMenuEntity implements Serializable, Comparable<SysMenuEntity> {
 	private static final long serialVersionUID = 1L;
 	
 	/**
@@ -90,7 +91,8 @@ public class SysMenuEntity implements Serializable {
 	private Boolean open;
 
 	@TableField(exist=false)
-	private List<?> list;
+	// private List<?> list;
+	private List<SysMenuEntity> list = new ArrayList<>();
 
 	public void setMenuId(Long menuId) {
 		this.menuId = menuId;
@@ -196,11 +198,11 @@ public class SysMenuEntity implements Serializable {
 		return orderNum;
 	}
 
-	public List<?> getList() {
+	public List<SysMenuEntity> getList() {
 		return list;
 	}
 
-	public void setList(List<?> list) {
+	public void setList(List<SysMenuEntity> list) {
 		this.list = list;
 	}
 
@@ -219,4 +221,9 @@ public class SysMenuEntity implements Serializable {
 	public void setOpen(Boolean open) {
 		this.open = open;
 	}
+
+	@Override
+	public int compareTo(SysMenuEntity o) {
+		return this.getOrderNum()-o.getOrderNum();
+	}
 }

src/main/java/io/renren/modules/sys/service/impl/SysMenuServiceImpl.java

@@ -17,6 +17,7 @@
 package io.renren.modules.sys.service.impl;
 
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import io.renren.common.utils.Constant;
 import io.renren.common.utils.MapUtils;
@@ -28,8 +29,7 @@ import io.renren.modules.sys.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 
 @Service("sysMenuService")
@@ -73,9 +73,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuDao, SysMenuEntity> i
 		}
 		
 		//用户菜单列表ly
-//		List<Long> menuIdList = sysUserService.queryAllMenuId(userId);
-//		return getAllMenuList(menuIdList);
-		return getAllMenuList(null);
+		List<Long> menuIdList = sysUserService.queryAllMenuId(userId);
+		//return getAllMenuList(menuIdList);
+		return getMenuList(menuIdList);
+		// return getAllMenuList(null);
 	}
 
 	@Override
@@ -114,4 +115,37 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuDao, SysMenuEntity> i
 		
 		return subMenuList;
 	}
+
+	/**
+	 * 获取拥有的菜单列表
+	 * @param menuIdList
+	 * @return
+	 */
+	private List<SysMenuEntity> getMenuList(List<Long> menuIdList) {
+		// 查询拥有的所有菜单
+		List<SysMenuEntity> menus = this.baseMapper.selectList(new EntityWrapper<SysMenuEntity>()
+				.in(Objects.nonNull(menuIdList), "menu_id", menuIdList)
+				.in("type", Arrays.asList(0, 1))); // 查询目录和菜单。io.renren.common.utils.Constant
+		//查询完成 对此list直接排序
+		Collections.sort(menus);
+
+		// 将id和菜单绑定
+		HashMap<Long, SysMenuEntity> menuMap = new HashMap<>(12);
+		for (SysMenuEntity s : menus) {
+			menuMap.put(s.getMenuId(), s);
+		}
+		// 使用迭代器,组装菜单的层级关系
+		Iterator<SysMenuEntity> iterator = menus.iterator();
+		while (iterator.hasNext()) {
+			SysMenuEntity menu = iterator.next();
+			SysMenuEntity parent = menuMap.get(menu.getParentId());
+			if (Objects.nonNull(parent)) {
+				parent.getList().add(menu);
+				// 将这个菜单从当前节点移除
+				iterator.remove();
+			}
+		}
+
+		return menus;
+	}
 }

src/main/resources/mapper/app/HPzDao.xml

@@ -269,6 +269,9 @@
 			test=" beginjzrq!=null and beginjzrq!='' and endjzrq!=null and endjzrq!='' ">
 			and jzsj between #{beginjzrq} and #{endjzrq}
 		</if>
+		<if test=" beginpzrq!=null and beginpzrq!='' and endpzrq!=null and endpzrq!='' ">
+			and pzrq between #{beginpzrq} and #{endpzrq}
+		</if>
 		<if test=" zymc!=null and zymc!='' ">
 			and zymc like CONCAT("%",#{zymc},"%")
 		</if>