Parcourir la source

首页改为“我的任务”

LLL il y a 1 an
Parent
commit
8bf177f7f8

+ 4 - 4
itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java

@@ -245,10 +245,10 @@ public class SysPermissionController {
 			List<SysPermission> metaList = sysPermissionService.queryByUser(loginUser.getUsername());
 //			//添加首页路由
 //			//update-begin-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
-//			if(!PermissionDataUtil.hasIndexPage(metaList)){
-//				SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName,"我的任务")).get(0);
-//				metaList.add(0,indexMenu);
-//			}
+			if(!PermissionDataUtil.hasIndexPage(metaList)){
+				SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName,"我的任务")).get(0);
+				metaList.add(0,indexMenu);
+			}
 //			//update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题,需要根据后台的路由配置来实现是否缓存
 
 			//update-begin--Author:zyf Date:20220425  for:自定义首页地址 LOWCOD-1578

+ 9 - 9
itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java

@@ -60,7 +60,7 @@ public class SysPermission implements Serializable {
 	 * 组件
 	 */
 	private String component;
-	
+
 	/**
 	 * 组件名字
 	 */
@@ -91,7 +91,7 @@ public class SysPermission implements Serializable {
 	 */
 	@TableField(value="is_leaf")
 	private boolean leaf;
-	
+
 	/**
 	 * 是否路由菜单: 0:不是  1:是(默认值1)
 	 */
@@ -119,12 +119,12 @@ public class SysPermission implements Serializable {
 	 * 删除状态 0正常 1已删除
 	 */
 	private Integer delFlag;
-	
+
 	/**
 	 * 是否配置菜单的数据权限 1是0否 默认0
 	 */
 	private Integer ruleFlag;
-	
+
 	/**
 	 * 是否隐藏路由菜单: 0否,1是(默认值0)
 	 */
@@ -149,10 +149,10 @@ public class SysPermission implements Serializable {
 	 * 更新时间
 	 */
 	private Date updateTime;
-	
+
 	/**按钮权限状态(0无效1有效)*/
 	private java.lang.String status;
-	
+
 	/**alwaysShow*/
     private boolean alwaysShow;
 
@@ -162,12 +162,12 @@ public class SysPermission implements Serializable {
 	/*update_end author:wuxianquan date:20190908 for:实体增加字段 */
 
     public SysPermission() {
-    	
+
     }
     public SysPermission(boolean index) {
     	if(index) {
     		this.id = "9502685863ab87f0ad1134142788a385";
-        	this.name="首页";
+        	this.name="我的任务";
         	this.component="dashboard/Analysis";
         	this.componentName="dashboard-analysis";
         	this.url="/dashboard/analysis";
@@ -182,6 +182,6 @@ public class SysPermission implements Serializable {
         	this.leaf=true;
         	this.hidden=false;
     	}
-    	
+
     }
 }

+ 7 - 7
itdmServer/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/util/PermissionDataUtil.java

@@ -30,7 +30,7 @@ public class PermissionDataUtil {
 
 	/**
 	 * 智能处理错误数据,简化用户失误操作
-	 * 
+	 *
 	 * @param permission
 	 */
 	public static SysPermission intelligentProcessData(SysPermission permission) {
@@ -55,7 +55,7 @@ public class PermissionDataUtil {
 			}
 			permission.setComponent(component);
 		}
-		
+
 		// 请求URL
 		if (oConvertUtils.isNotEmpty(permission.getUrl())) {
 			String url = permission.getUrl();
@@ -67,7 +67,7 @@ public class PermissionDataUtil {
 			}
 			permission.setUrl(url);
 		}
-		
+
 		// 一级菜单默认组件
 		if (0 == permission.getMenuType() && oConvertUtils.isEmpty(permission.getComponent())) {
 			// 一级菜单默认组件
@@ -75,7 +75,7 @@ public class PermissionDataUtil {
 		}
 		return permission;
 	}
-	
+
 	/**
 	 * 如果没有index页面 需要new 一个放到list中
 	 * @param metaList
@@ -83,7 +83,7 @@ public class PermissionDataUtil {
 	public static void addIndexPage(List<SysPermission> metaList) {
 		boolean hasIndexMenu = false;
 		for (SysPermission sysPermission : metaList) {
-			if("首页".equals(sysPermission.getName())) {
+			if("我的任务".equals(sysPermission.getName())) {
 				hasIndexMenu = true;
 				break;
 			}
@@ -101,12 +101,12 @@ public class PermissionDataUtil {
 	public static boolean hasIndexPage(List<SysPermission> metaList){
 		boolean hasIndexMenu = false;
 		for (SysPermission sysPermission : metaList) {
-			if("首页".equals(sysPermission.getName())) {
+			if("我的任务".equals(sysPermission.getName())) {
 				hasIndexMenu = true;
 				break;
 			}
 		}
 		return hasIndexMenu;
 	}
-	
+
 }