From 4027720673c690cb750bd4cd25fb68574f7f47f5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Nov 2021 20:14:24 +0800
Subject: [PATCH] 派遣单位查询修改
---
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml | 11 +++--------
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 6 +++---
src/main/java/org/springblade/modules/information/controller/InformationsController.java | 2 ++
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
index 6a35000..f7f8f1c 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -5,8 +5,7 @@
<!--派遣公司分页信息-->
<select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
select
- distinct
- sdu.*,bt.dept_name tenantName,bu.real_name realName
+ sdu.*,bt.dept_name deptName,sj.dept_name jurisdictionName
from
sys_dispatcher_unit sdu
LEFT JOIN
@@ -14,13 +13,9 @@
ON
sdu.dept_id = bt.id
left join
- sys_dispatcher sd
+ sys_jurisdiction sj
on
- sdu.id = sd.dispatcher_unit_id
- left join
- blade_user bu
- on
- sd.user_ids = bu.id
+ sj.id = sdu.jurisdiction
WHERE
1=1
<if test="dispatcherUnit.tenantName!=null and dispatcherUnit.tenantName!=''">
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationsController.java b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
index 35304ef..6a4ec1b 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationsController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationsController.java
@@ -240,4 +240,6 @@
}
return R.data(lists);
}
+
+
}
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 ee0dc67..7454e17 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -51,11 +51,11 @@
on
sj.id = i.jurisdiction
LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
- status=1 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
+ status=1 and is_deleted = 0 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
- status=1 AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
+ status=1 AND hold=1 and is_deleted = 0 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
- status=1 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
+ status=1 AND dispatch=0 and is_deleted = 0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
where 1=1
<if test="information.enterprisename!=null and information.enterprisename!=''">
and i.enterpriseName like concat(concat('%', #{information.enterprisename}),'%')
--
Gitblit v1.9.3