年份筛选年份全部 无问题

src/main/java/com/liang/controller/PrjAnnualbudgetController.java

@@ -151,17 +151,21 @@ public class PrjAnnualbudgetController extends BaseController {
                            @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
         PageHelper.startPage(pageNum, pageSize);
         Map<String, String> paraMap = new HashMap<>();
+
         if (nf != null && !nf.isEmpty()){
             String[] nfs = nf.split(",");
-            if (nfs.length >1){
-                paraMap.put("nf",nfs[1]);
+            if (nfs.length>1){
+                if (nfs[1].equals("0")){
+                    paraMap.put("nf","");
+
+                }else {
+                    paraMap.put("nf", nfs[1]);
+                }
 
             }else {
-                paraMap.put("nf", nf);
+                paraMap.put("nf",nf);
             }
-
         }
-
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("xmmc", xmmc);

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -203,11 +203,18 @@ public class StaBudgetapprovalController extends BaseController {
         if (nf != null && !nf.isEmpty()){
             String[] nfs = nf.split(",");
             if (nfs.length>1){
-                paraMap.put("nf", nfs[1]);
+                if (nfs[1].equals("0")){
+                    paraMap.put("nf","");
+
+                }else {
+                    paraMap.put("nf", nfs[1]);
+                }
+
             }else {
-                paraMap.put("nf", nf);
+                paraMap.put("nf",nf);
             }
         }
+
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("sqmc", sqmc);
@@ -774,12 +781,19 @@ public class StaBudgetapprovalController extends BaseController {
         PageHelper.startPage(pageNum, pageSize);
 
         Map<String, String> paraMap = new HashMap<>();
+
         if (nf != null && !nf.isEmpty()){
             String[] nfs = nf.split(",");
-            if (nfs.length > 1){
-                paraMap.put("nf", nfs[1]);
+            if (nfs.length>1){
+                if (nfs[1].equals("0")){
+                    paraMap.put("nf","");
+
+                }else {
+                    paraMap.put("nf", nfs[1]);
+                }
+
             }else {
-                paraMap.put("nf", nf);
+                paraMap.put("nf",nf);
             }
         }
         paraMap.put("sortName", sortName);
@@ -990,10 +1004,17 @@ public class StaBudgetapprovalController extends BaseController {
         PageHelper.startPage(pageNum, pageSize);
 
         Map<String, String> paraMap = new HashMap<>();
+
         if (nf != null && !nf.isEmpty()){
             String[] nfs = nf.split(",");
             if (nfs.length>1){
-                paraMap.put("nf",nfs[1]);
+                if (nfs[1].equals("0")){
+                    paraMap.put("nf","");
+
+                }else {
+                    paraMap.put("nf", nfs[1]);
+                }
+
             }else {
                 paraMap.put("nf",nf);
             }
@@ -1083,14 +1104,20 @@ public class StaBudgetapprovalController extends BaseController {
                                      @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
         Map<String, String> paraMap = new HashMap<>();
         PageHelper.startPage(pageNum, pageSize);
+
         if (nf != null && !nf.isEmpty()){
             String[] nfs = nf.split(",");
             if (nfs.length>1){
-                paraMap.put("nf", nfs[1]);
+                if (nfs[1].equals("0")){
+                    paraMap.put("nf","");
+
+                }else {
+                    paraMap.put("nf", nfs[1]);
+                }
+
             }else {
-                paraMap.put("nf", nf);
+                paraMap.put("nf",nf);
             }
-
         }
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
@@ -1390,12 +1417,19 @@ public class StaBudgetapprovalController extends BaseController {
         PageHelper.startPage(pageNum, pageSize);
 
         Map<String, String> paraMap = new HashMap<>();
+
         if (nf != null && !nf.isEmpty()){
             String[] nfs = nf.split(",");
             if (nfs.length>1){
-                paraMap.put("nf", nfs[1]);
+                if (nfs[1].equals("0")){
+                    paraMap.put("nf","");
+
+                }else {
+                    paraMap.put("nf", nfs[1]);
+                }
+
             }else {
-                paraMap.put("nf", nf);
+                paraMap.put("nf",nf);
             }
         }
         paraMap.put("sortName", sortName);

src/main/java/com/liang/controller/StaPayapprovalController.java

@@ -140,10 +140,17 @@ public class StaPayapprovalController extends BaseController {
         }
 
         Map<String, String> paraMap = new HashMap<>();
+
         if (nf != null && !nf.isEmpty()){
             String[] nfs = nf.split(",");
             if (nfs.length>1){
-                paraMap.put("nf",nfs[1]);
+                if (nfs[1].equals("0")){
+                    paraMap.put("nf","");
+
+                }else {
+                    paraMap.put("nf", nfs[1]);
+                }
+
             }else {
                 paraMap.put("nf",nf);
             }

src/main/java/com/liang/controller/StaReimbursementController.java

@@ -147,12 +147,19 @@ public class StaReimbursementController extends BaseController {
                            @RequestParam(required = false, defaultValue = "", value = "nf") String nf) {
         PageHelper.startPage(pageNum, pageSize);
         Map<String, String> paraMap = new HashMap<>();
+
         if (nf != null && !nf.isEmpty()){
             String[] nfs = nf.split(",");
-            if (nfs.length >1){
-                paraMap.put("nf", nfs[1]);
+            if (nfs.length>1){
+                if (nfs[1].equals("0")){
+                    paraMap.put("nf","");
+
+                }else {
+                    paraMap.put("nf", nfs[1]);
+                }
+
             }else {
-                paraMap.put("nf", nf);
+                paraMap.put("nf",nf);
             }
         }
         paraMap.put("sortName", sortName);

src/main/resources/templates/annualbudget/list.html

@@ -32,7 +32,7 @@
                             <label class="layui-form-label" style="width: 70px">年份</label>
                             <div class="layui-input-inline" style="width: 140px">
                                 <select name="nf" id="nf" lay-filter="status">
-                                    <option value="">全部</option>
+                                    <option value="0">全部</option>
                                     <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
                                 </select>
                             </div>

src/main/resources/templates/payapply/list.html

@@ -41,8 +41,7 @@
                             <label class="layui-form-label" style="width: 70px;">年份</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <select name="nf" id="nf" lay-filter="status" class="layui-select">
-                                    <option value="">全部</option>
-                                    <!-- Assume 'yearList' is populated with options -->
+                                    <option value="0">全部</option>
                                     <option th:each="item: ${yearList}" th:text="${item}" th:value="${item}"></option>
                                 </select>
                             </div>

src/main/resources/templates/reimburse/list.html

@@ -41,7 +41,7 @@
                             <label class="layui-form-label" style="width: 70px;">年份</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <select name="nf" id="nf" lay-filter="status" class="layui-select">
-                                    <option value="">全部</option>
+                                    <option value="0">全部</option>
                                     <!-- Assume 'yearList' is populated with options -->
                                     <option th:each="item: ${yearList}" th:text="${item}" th:value="${item}"></option>
                                 </select>

src/main/resources/templates/stabudgetapproval/list_apply.html

@@ -61,7 +61,7 @@
                             <label class="layui-form-label" style="width: 70px;">年份</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <select name="nf" id="nf" lay-filter="status">
-                                    <option value="">全部</option>
+                                    <option value="0">全部</option>
                                     <option th:each="item:${yearList}" th:text="${item.nf}"
                                             th:value="${item.nf}"></option>
                                 </select>

src/main/resources/templates/stabudgetapproval/list_imprest_my.html

@@ -39,7 +39,7 @@
               <label class="layui-form-label" style="width: 30px; margin-left: -10px">年份</label>
               <div class="layui-input-inline" style="width: 100px">
                 <select name="nf" id="nf" lay-filter="status">
-                  <option value="">全部</option>
+                  <option value="0">全部</option>
                   <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
                 </select>
               </div>

src/main/resources/templates/stafeemanage/list_allapply.html

@@ -39,7 +39,7 @@
                             <label class="layui-form-label" style="width: 60px">年份</label>
                             <div class="layui-input-inline" style="width: 200px">
                                 <select name="nf" id="nf" lay-filter="status">
-                                    <option value="">全部</option>
+                                    <option value="0">全部</option>
                                     <option th:each="item:${yearList}" th:text="${item.nf}"
                                             th:value="${item.nf}"></option>
                                 </select>

src/main/resources/templates/stafeemanage/list_approving.html

@@ -38,7 +38,7 @@
                             <label class="layui-form-label" style="width: 30px">年份</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <select name="nf" id="nf" lay-filter="status">
-                                    <option value="">全部</option>
+                                    <option value="0">全部</option>
                                     <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
                                 </select>
                             </div>

src/main/resources/templates/stafeemanage/list_feemanage.html

@@ -38,7 +38,7 @@
                             <label class="layui-form-label" style="width: 70px">年份</label>
                             <div class="layui-input-inline" style="width: 140px">
                                 <select name="nf" id="nf" lay-filter="status">
-                                    <option value="">全部</option>
+                                    <option value="0">全部</option>
                                     <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
                                 </select>
                             </div>