From 60dddbf3d0182c8a5220b04d3ea207b0756bc0f3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 17:35:15 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index 34b61c5..e4d57fa 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -99,7 +99,22 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入record")
public R<IPage<RecordVO>> page(RecordVO record, Query query) {
- IPage<RecordVO> pages = recordService.selectRecordPage(Condition.getPage(query), record);
+ IPage<RecordVO> pages;
+ if (record.getUsetype().equals("0")) {
+ pages = recordService.selectRecordPage(Condition.getPage(query), record, null);
+ } else if (record.getUsetype().equals("1")) {
+ String childer = informationService.selJurchilder(record.getJurisdiction());
+ String[] split = childer.split(",");
+ String strArrays = "";
+ for (int j = 0; j < split.length; j++) {
+ strArrays += "'" + split[j] + "',";
+ }
+ String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
+ pages = recordService.selectRecordPage(Condition.getPage(query), record, jurisdiction);
+ } else {
+ pages = recordService.selectRecordPage(Condition.getPage(query), record, null);
+ }
+
return R.data(pages);
}
@@ -146,15 +161,16 @@
if (record.getPtype().equals("2")){
Long i = 1425366663452196865L;
dept.setParentId(i);
+ dept.setAncestors("0,1425366663452196865");
}
//培训公司
else {
Long i = 1420222768149966850L;
dept.setParentId(i);
+ dept.setAncestors("0,1420222768149966850");
}
dept.setTenantId("000000");
dept.setDeptName(information.getEnterprisename());
- dept.setAncestors("0,1413470343230877697");
dept.setDeptCategory(1);
if (iDeptService.submit(dept)) {
CacheUtil.clear(SYS_CACHE);
--
Gitblit v1.9.3