From 15235f2112d1d46cd7af69bcd07174005d05e22e Mon Sep 17 00:00:00 2001 From: chenyuxi <chenyuxi@wanxin-holdings.com> Date: Wed, 19 Mar 2025 15:24:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8A=B1=E5=90=8D=E5=86=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/TEmployeeProjectBelongDeptMapper.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectBelongDeptMapper.xml b/yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectBelongDeptMapper.xml index 60e5c32f1..6fc94dfe7 100644 --- a/yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectBelongDeptMapper.xml +++ b/yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectBelongDeptMapper.xml @@ -30,8 +30,7 @@ <result property="empDeptid" column="emp_deptid"/> </resultMap> <sql id="tEmployeeProjectBelongDept_where"> - /* æ´¾å•å®¡æ ¸é€šè¿‡ï¼Œæˆ–其他路径 */ - and ((a.PROJECT_SOURCE = '1' and a.STATUS = 1) or a.PROJECT_SOURCE != '1') + /* æ´¾å•å®¡æ ¸é€šè¿‡ï¼Œæˆ–其他路径 2025-3-19 15:22:08 倩倩è¦æ±‚åŽ»æŽ‰å®¡æ ¸æ¡ä»¶*/ <if test="tEmployeeProjectBelongDept != null"> <if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''"> AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId} @@ -215,7 +214,7 @@ from t_employee_project a LEFT JOIN t_employee_project_belong_dept b on a.id=b.id <where> - a.DELETE_FLAG ='0' and ((a.PROJECT_SOURCE = '1' and a.STATUS = 1) or a.PROJECT_SOURCE != '1') and b.id is null + a.DELETE_FLAG ='0' and b.id is null <if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''"> AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId} </if> -- 2.18.1