From bd57b7c6e2307d6dfb07d778adfefc13c1afbffe Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 二月 2026 11:48:44 +0800
Subject: [PATCH] 经销商管理

---
 server/dmmall_service/src/main/resources/templates/serviceImpl.vm |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/server/dmmall_service/src/main/resources/templates/serviceImpl.vm b/server/dmmall_service/src/main/resources/templates/serviceImpl.vm
index 5ff71f2..fe0dd8a 100644
--- a/server/dmmall_service/src/main/resources/templates/serviceImpl.vm
+++ b/server/dmmall_service/src/main/resources/templates/serviceImpl.vm
@@ -90,15 +90,15 @@
         QueryWrapper<${entityName}> queryWrapper = new QueryWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
         #foreach ($column in $columns)
-            #if(${column.javaType} !='Date')
-               queryWrapper.lambda().eq(pageWrap.getModel().get${column.getJavaName}() != null,${entityName}::get${column.getJavaName}, pageWrap.getModel().get${column.getJavaName}());
-            #end
-            #if(${column.javaType} =='Date')
-             if (pageWrap.getModel().getId() != null) {
-                  queryWrapper.lambda().ge(${entityName}::get${column.getJavaName}, Utils.Date.getStart(pageWrap.getModel().get${column.getJavaName}()));
-                  queryWrapper.lambda().le(${entityName}::get${column.getJavaName}, Utils.Date.getEnd(pageWrap.getModel().get${column.getJavaName}()));
-             }
-            #end
+        #if(${column.javaType} !='Date')
+        queryWrapper.lambda().eq(pageWrap.getModel().get${column.getJavaName}() != null,${entityName}::get${column.getJavaName}, pageWrap.getModel().get${column.getJavaName}());
+        #end
+        #if(${column.javaType} =='Date')
+        if (pageWrap.getModel().get${column.getJavaName}() != null) {
+            queryWrapper.lambda().ge(${entityName}::get${column.getJavaName}, Utils.Date.getStart(pageWrap.getModel().get${column.getJavaName}()));
+            queryWrapper.lambda().le(${entityName}::get${column.getJavaName}, Utils.Date.getEnd(pageWrap.getModel().get${column.getJavaName}()));
+        }
+        #end
         #end
         for(PageWrap.SortData sortData: pageWrap.getSorts()) {
             if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -109,7 +109,6 @@
         }
         return PageData.from(${entityNameLower}Mapper.selectPage(page, queryWrapper));
     }
-
     @Override
     public long count(${entityName} ${entityNameLower}) {
         QueryWrapper<${entityName}> wrapper = new QueryWrapper<>(${entityNameLower});

--
Gitblit v1.9.3