|
@@ -184,7 +184,8 @@ public class StaBudgetapprovalController extends BaseController {
|
184
|
184
|
@RequestParam(required = false, defaultValue = "", value = "nf") String nf,
|
185
|
185
|
@RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
|
186
|
186
|
@RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
|
187
|
|
- @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc) {
|
|
187
|
+ @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc,
|
|
188
|
+ @RequestParam(required = false, defaultValue = "", value = "bzid")String bzid) {
|
188
|
189
|
SysUserInfo userInfo = getSysUserInfo();
|
189
|
190
|
List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
|
190
|
191
|
String post = "";
|
|
@@ -219,6 +220,7 @@ public class StaBudgetapprovalController extends BaseController {
|
219
|
220
|
paraMap.put("ssbmmc", ssbmmc);
|
220
|
221
|
paraMap.put("dkyfzr", dkyfzr);
|
221
|
222
|
paraMap.put("xmmc",xmmc);
|
|
223
|
+ paraMap.put("bzid",bzid);
|
222
|
224
|
|
223
|
225
|
if (!userInfo.getAccount().equals("admin")) {
|
224
|
226
|
if (!"过".equals(post)) {
|
|
@@ -908,7 +910,6 @@ public class StaBudgetapprovalController extends BaseController {
|
908
|
910
|
}
|
909
|
911
|
}
|
910
|
912
|
PageHelper.startPage(pageNum, pageSize);
|
911
|
|
-
|
912
|
913
|
Map<String, String> paraMap = new HashMap<>();
|
913
|
914
|
paraMap.put("sortName", sortName);
|
914
|
915
|
paraMap.put("sortOrder", sortOrder);
|
|
@@ -919,14 +920,12 @@ public class StaBudgetapprovalController extends BaseController {
|
919
|
920
|
paraMap.put("dkyfzr", dkyfzr);
|
920
|
921
|
paraMap.put("ssbmmc", ssbmmc);
|
921
|
922
|
paraMap.put("nf", nf);
|
922
|
|
-
|
923
|
923
|
if (!userInfo.getAccount().equals("admin")) {
|
924
|
924
|
if (!"过".equals(post)) {
|
925
|
925
|
paraMap.put("userId", userInfo.getUserId().toString());
|
926
|
926
|
}
|
927
|
927
|
}
|
928
|
928
|
List<StaBudgetapproval> list = staBudgetapprovalService.getYbzFysqList(paraMap);
|
929
|
|
-
|
930
|
929
|
PageInfo<StaBudgetapproval> pageinfo = new PageInfo<>(list);
|
931
|
930
|
//取出查询结果
|
932
|
931
|
List<StaBudgetapproval> rows = pageinfo.getList();
|