Merge remote-tracking branch 'origin/master'

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

@@ -83,7 +83,7 @@ public class SysPermissionController {
 			LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
 			query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
 			query.orderByAsc(SysPermission::getSortNo);
-			
+
 			//支持通过菜单名字，模糊查询
 			if(oConvertUtils.isNotEmpty(sysPermission.getName())){
 				query.like(SysPermission::getName, sysPermission.getName());
@@ -207,7 +207,7 @@ public class SysPermissionController {
 
 //	/**
 //	 * 查询用户拥有的菜单权限和按钮权限（根据用户账号）
-//	 * 
+//	 *
 //	 * @return
 //	 */
 //	@RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
@@ -243,13 +243,13 @@ public class SysPermissionController {
 				return Result.error("请登录系统！");
 			}
 			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);
-			}
-			//update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
+//			//添加首页路由
+//			//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);
+//			}
+//			//update-end-author:taoyan date:20200211 for: TASK #3368 【路由缓存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
 
 			//update-begin--Author:zyf Date:20220425  for:自定义首页地址 LOWCOD-1578
 			String version = request.getHeader(CommonConstant.VERSION);
@@ -273,7 +273,7 @@ public class SysPermissionController {
 				}
 				//update-end---author:liusq ---date:2022-06-29  for：设置自定义首页地址和组件-----------
 			}
-			
+
 			JSONObject json = new JSONObject();
 			JSONArray menujsonArray = new JSONArray();
 			this.getPermissionJsonArray(menujsonArray, metaList, null);
@@ -299,7 +299,7 @@ public class SysPermissionController {
 			json.put("sysSafeMode", jeecgBaseConfig.getSafeMode());
 			result.setResult(json);
 		} catch (Exception e) {
-			result.error500("查询失败:" + e.getMessage());  
+			result.error500("查询失败:" + e.getMessage());
 			log.error(e.getMessage(), e);
 		}
 		return result;

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,15 +162,15 @@ 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.component="dashboard/Analysis";
-        	this.componentName="dashboard-analysis";
-        	this.url="/dashboard/analysis";
+        	this.name="联锁总表";
+        	this.component="module_interLock/InterlockSummary/index";
+//        	this.componentName="dashboard-analysis";
+        	this.url="/interLock/summary";
         	this.icon="home";
         	this.menuType=0;
         	this.sortNo=0.0;
@@ -182,6 +182,6 @@ public class SysPermission implements Serializable {
         	this.leaf=true;
         	this.hidden=false;
     	}
-    	
+
     }
 }