2.0

xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@@ -109,6 +109,7 @@ public class XmMenuController {
 		RequestUtils.transformArray(params, "dclasss");		
 		IPage page=QueryTools.initPage(params);
 		this.paramsInit(params);
+		QueryTools.alias(params,"productId res.productId");
 		QueryWrapper<XmMenu> qw = QueryTools.initQueryWrapper(XmMenu.class , params);
 		List<Map<String,Object>> datas = xmMenuService.selectListMapByWhere(page,qw,params);
 		
@@ -165,6 +166,7 @@ public class XmMenuController {
 		RequestUtils.transformArray(params, "dclasss");
 		IPage page=QueryTools.initPage(params);
 		this.paramsInit(params);
+		QueryTools.alias(params,"productId res.productId");
 		QueryWrapper<XmMenu> qw = QueryTools.initQueryWrapper(XmMenu.class , params);
 		this.paramsInit(params);
 		List<Map<String,Object>>	datas = xmMenuService.selectListMapByWhereWithState(page,qw,params);	//列出XmMenu列表

xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java

@@ -134,6 +134,8 @@ public class XmProductController {
 				params.put("platformBranchId",platformBranchId);
 			}
 		}
+
+		QueryTools.alias(params,"branchId res.branchId");
 		QueryWrapper<XmProduct> qw = QueryTools.initQueryWrapper(XmProduct.class , params);
 		List<Map<String,Object>> datas = xmProductService.selectListMapByWhere(page,qw,params);
 		return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProduct列表
@@ -176,7 +178,7 @@ public class XmProductController {
 		}
 		params.put("platformBranchId",platformBranchId);
 		params.put("linkBranchId",user.getBranchId());
-
+		QueryTools.alias(params,"branchId res.branchId");
 		QueryWrapper<XmProduct> qw = QueryTools.initQueryWrapper(XmProduct.class , params);
 		List<Map<String,Object>> datas = xmProductService.selectListMapByWhereWithState(page,qw,params);
  		return Result.ok().setData(datas).setTotal(page.getTotal());

xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

@@ -116,6 +116,7 @@ public class XmProjectController {
 		}
 		params.put("linkBranchId",user.getBranchId());
 		params.put("platformBranchId",platformBranchId);
+		QueryTools.alias(params,"branchId res.branchId");
 		QueryWrapper<XmProject> qw = QueryTools.initQueryWrapper(XmProject.class , params);
 		List<Map<String,Object>> datas = xmProjectService.selectListMapByWhere(page,qw,params);	//列出XmProject列表
 		return Result.ok().setData(datas);