2.0

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

@@ -119,7 +119,7 @@ public class XmProjectController {
 		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);
+		return Result.ok().setData(datas).setTotal(page.getTotal());
 		
 		
 		

xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml

@@ -30,7 +30,7 @@
         <if test="ext.isTpl!=null and ext.isTpl=='1'">
             and (res.branch_id in( #{ext.platformBranchId},#{ext.linkBranchId}) and res.is_tpl='1')
         </if>
-        <if test="ext.del==null or del==''">
+        <if test="ext.del==null or ext.del==''">
             and res.del!="1"
         </if>
         <if test="ext.linkBranchId!=null and ext.linkBranchId!=''">