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/permit/controller/PermitController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 1ab162a..96c11c2 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -102,7 +102,21 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入permit")
public R<IPage<PermitVO>> page(PermitVO permit, Query query) {
- IPage<PermitVO> pages = permitService.selectPermitPage(Condition.getPage(query), permit);
+ IPage<PermitVO> pages;
+ if (permit.getUsetype().equals("0")) {
+ pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+ } else if (permit.getUsetype().equals("1")) {
+ String childer = informationService.selJurchilder(permit.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 = permitService.selectPermitPage(Condition.getPage(query), permit, jurisdiction);
+ } else {
+ pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+ }
return R.data(pages);
}
@@ -150,15 +164,21 @@
if (permit.getPtype().equals("0")){
Long i = 1413470343230877697L;
dept.setParentId(i);
+ dept.setAncestors("0,1413470343230877697");
}
//培训公司
- else {
+ else if (permit.getPtype().equals("1")){
Long i = 1418458374477549569L;
dept.setParentId(i);
+ dept.setAncestors("0,1418458374477549569");
+ }
+ else{
+ Long i = 1420222961377357825L;
+ dept.setParentId(i);
+ dept.setAncestors("0,1420222961377357825");
}
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