Browse Source

搜索参数带入

ly 2 weeks ago
parent
commit
ade5528f49

+ 0 - 4
src/main/java/com/liang/controller/PrjAnnualbudgetController.java

@@ -240,7 +240,6 @@ public class PrjAnnualbudgetController extends BaseController {
240
             }
240
             }
241
         }
241
         }
242
         PageHelper.startPage(pageNum, pageSize);
242
         PageHelper.startPage(pageNum, pageSize);
243
-
244
         Map<String, String> paraMap = new HashMap<>();
243
         Map<String, String> paraMap = new HashMap<>();
245
         paraMap.put("sortName", sortName);
244
         paraMap.put("sortName", sortName);
246
         paraMap.put("sortOrder", sortOrder);
245
         paraMap.put("sortOrder", sortOrder);
@@ -252,7 +251,6 @@ public class PrjAnnualbudgetController extends BaseController {
252
         paraMap.put("rwsmc", rwsmc);
251
         paraMap.put("rwsmc", rwsmc);
253
         paraMap.put("nf", nf);
252
         paraMap.put("nf", nf);
254
         paraMap.put("add",add);
253
         paraMap.put("add",add);
255
-
256
         if (!userInfo.getAccount().equals("admin")) {
254
         if (!userInfo.getAccount().equals("admin")) {
257
             if (!"过".equals(post)) {
255
             if (!"过".equals(post)) {
258
                 paraMap.put("userId", userInfo.getUserId().toString());
256
                 paraMap.put("userId", userInfo.getUserId().toString());
@@ -264,7 +262,6 @@ public class PrjAnnualbudgetController extends BaseController {
264
             }
262
             }
265
         }
263
         }
266
         List<PrjAnnualbudget> list = prjAnnualbudgetService.getNdysList(paraMap);
264
         List<PrjAnnualbudget> list = prjAnnualbudgetService.getNdysList(paraMap);
267
-
268
         PageInfo<PrjAnnualbudget> pageinfo = new PageInfo<>(list);
265
         PageInfo<PrjAnnualbudget> pageinfo = new PageInfo<>(list);
269
         //取出查询结果
266
         //取出查询结果
270
         List<PrjAnnualbudget> rows = pageinfo.getList();
267
         List<PrjAnnualbudget> rows = pageinfo.getList();
@@ -275,7 +272,6 @@ public class PrjAnnualbudgetController extends BaseController {
275
 
272
 
276
         return BaseResult.success(result);
273
         return BaseResult.success(result);
277
     }
274
     }
278
-
279
     /**
275
     /**
280
      * 新建数据
276
      * 新建数据
281
      *
277
      *

+ 4 - 1
src/main/resources/templates/stabudgetapproval/list_annualbudget.html

@@ -131,7 +131,10 @@
131
         page: {
131
         page: {
132
           curr: 1 // 页码从1开始
132
           curr: 1 // 页码从1开始
133
         },
133
         },
134
-        where: form.val("search-form")
134
+        where: {
135
+          ...form.val("search-form"),
136
+          add: '1'
137
+        }
135
       });
138
       });
136
       return false;
139
       return false;
137
     });
140
     });