Merge branch 'tzq' into 'develop'

绩效bug修复 See merge request 8timerv2/8timerapiv200!193

Merge branch 'tzq' into 'develop'
绩效bug修复 See merge request 8timerv2/8timerapiv200!193
6fdcfe4b · dengshichuan · 3288a002 · 81ecf3de · 6fdcfe4b · 6fdcfe4b
Commit 6fdcfe4b authored Jun 15, 2020 by dengshichuan
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/main/java/cn/timer/api/controller/jxgl/JxglController.java
+0 -0

src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
+1 -1

No files found.
--- a/src/main/java/cn/timer/api/controller/jxgl/JxglController.java
+++ b/src/main/java/cn/timer/api/controller/jxgl/JxglController.java
--- a/src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
+++ b/src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
@@ -306,7 +306,7 @@
 			LEFT JOIN jxgl_performance_appraisal c ON a.performance_appraisal_id = c.id
        
        <where>
-        	 a.org_code = #{param.orgCode} 
+        	 c.org_code = #{param.orgCode} 
        	<if test="param.query != null and param.query != ''">
        		and (
        			b.name like CONCAT('%',#{param.query},'%') or