Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into dsc

4a430462 · 邓实川 · aaa8c206 · 6fdcfe4b · 4a430462 · 4a430462
Commit 4a430462 authored Jun 15, 2020 by 邓实川
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