From 1c424c6140ea6eb7d7d45a25abaef9ef17479a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 6 Nov 2023 18:24:41 +0800
Subject: [PATCH] 2.0

---
 xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java | 2 +-
 xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
index cacb1f46..8002c78f 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
+++ b/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());
 		
 		
 		
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
index cd5d2ba8..abc49ee1 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
+++ b/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!=''">