ererkook %!s(int64=5) %!d(string=hai) anos
pai
achega
95e9f4eb51

+ 12 - 12
src/main/java/com/mokamrp/privates/controller/BaseController.java

@@ -75,11 +75,11 @@ public class BaseController<T> {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Iterator<Map.Entry<String, String>> fileterIt = indexHandle.getFilter().entrySet().iterator();
-        Wrapper<T> warpper = new EntityWrapper<T>();
+        Iterator<Map.Entry<String, String>> filterIt = indexHandle.getFilter().entrySet().iterator();
+        Wrapper<T> wrapper = new EntityWrapper<T>();
         //.@leon where like,=,<>
-        while (fileterIt.hasNext()) {
-            Map.Entry<String, String> entry = fileterIt.next();
+        while (filterIt.hasNext()) {
+            Map.Entry<String, String> entry = filterIt.next();
             String key = entry.getKey();
             String value = entry.getValue();
             Map<String, String> op = indexHandle.getOp();
@@ -91,37 +91,37 @@ public class BaseController<T> {
             String columnName = StringUtils.humpToLine2(key);
             switch (op.get(key)) {
                 case "=":
-                    warpper = warpper.eq(columnName, value);
+                    wrapper = wrapper.eq(columnName, value);
                     break;
                 case "LIKE":
-                    warpper = warpper.like(columnName, "%" + value + "%");
+                    wrapper = wrapper.like(columnName, "%" + value + "%");
                     break;
                 case "<>":
-                    warpper = warpper.ne(columnName, value);
+                    wrapper = wrapper.ne(columnName, value);
                     break;
                 case "IN(...)":
-                    warpper = warpper.in(columnName, value);
+                    wrapper = wrapper.in(columnName, value);
                     break;
             }
         }
         //.统计数量
-        Integer total = service.selectCount(warpper);
+        Integer total = service.selectCount(wrapper);
         //.@leon order
         if (indexHandle.getOrder() != null && indexHandle.getSort() != null) {
             String order = indexHandle.getOrder();
             String sort = indexHandle.getSort();
             if (!order.isEmpty() && !sort.isEmpty()) {
                 if (order.equals("asc")) {
-                    warpper = warpper.orderBy(sort, true);
+                    wrapper = wrapper.orderBy(sort, true);
                 } else if (order.equals("desc")) {
-                    warpper = warpper.orderBy(sort, false);
+                    wrapper = wrapper.orderBy(sort, false);
                 }
             }
         }
 
         //.@leon offset limit
         Page<T> page = service.selectPage(
-                new Page<T>(indexHandle.getOffset(), indexHandle.getLimit()), warpper
+                new Page<T>(indexHandle.getOffset(), indexHandle.getLimit()), wrapper
         );
 
         Map<String, Object> resMap = new HashMap<String, Object>();