From 4f3f12b7a0abbaa4984ff41d775efd412836de75 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 20:47:17 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 4 ++--
src/main/java/org/springblade/modules/information/controller/InformationController.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 28d0e51..30b0d71 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -346,7 +346,7 @@
*
* @return
*/
- @GetMapping("/queryYearKh")
+ @PostMapping("/queryYearKh")
public R queryYearKh(String jurisdiction, String deptid) {
Calendar cal = Calendar.getInstance();
String year = String.valueOf(cal.get(Calendar.YEAR));
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index c5d8228..5a0d8f2 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -157,7 +157,7 @@
WHERE u.examination_type = 1
GROUP BY u.dept_id,u.jurisdiction
) B ON A.dept_id = B.dept_id
- <if test="jurisdiction!=null and jurisdiction==''">
+ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
WHERE A.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid==''">
@@ -180,7 +180,7 @@
WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
AND hold = 2
GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
- <if test="jurisdiction!=null and jurisdiction==''">
+ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
WHERE A.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid==''">
--
Gitblit v1.9.3