From 0b3ed821d59b6734f7268e80daae9f75ee703cb0 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 11 Jul 2024 15:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20-=20App?=
 =?UTF-8?q?=E7=AB=AF=E9=9A=90=E6=82=A3=E7=AE=A1=E7=90=86=E3=80=81=E5=A4=84?=
 =?UTF-8?q?=E7=BD=9A=E7=AE=A1=E7=90=86=E8=A7=92=E6=A0=87=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E9=A2=84=E7=95=99=E5=8F=AA=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=9A=84=E5=A4=84=E7=BD=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/keyProjects/KeyprojectHiddenMapper.xml     | 8 +++++++-
 .../mybatis/dsno2/keyProjects/OutSourcedMapper.xml        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
index 83793a1d..8aee1e56 100644
--- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
+++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
@@ -1640,7 +1640,13 @@ FROM
 			</if>
 			AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID =  #{pd.OUTSOURCED_ID} )
 		<if test="pd.CREATOR != null and pd.CREATOR != ''">
-			and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end)
+			<!-- 预留只查看自己下发的处罚的case -->
+			<if test="pd.ONLY_SELF != null and pd.ONLY_SELF != '' and pd.ONLY_SELF == 1">
+				and h.CREATOR like CONCAT('%', #{pd.CREATOR},'%')
+			</if>
+			<if test="pd.ONLY_SELF == null or pd.ONLY_SELF == ''">
+				and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end)
+			</if>
 		</if>
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
index 7a9f668a..f5695e0b 100644
--- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
+++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
@@ -530,7 +530,7 @@
 		vua.NAME OUTSOURCED_CREATOR_NAME,
 		ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
 		p.`NAME` as UNITS_PIC_NAME
-		,ifnull(cfsl.co,0) as cfcount
+		,SUM(ifnull(cfsl.co, 0))  as cfcount
 		from
 		<include refid="tableName"></include> f
 		left join bus_units b using (UNITS_ID)