Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!313

src/main/java/cn/timer/api/controller/jxgl/JxglController.java

@@ -648,10 +648,14 @@ public class JxglController {
 			}
 		}
 		
+//			JxglPerformanceAppraisal performanceAppraisal = jxglPerformanceAppraisalMapper
+//					.selectOne(new QueryWrapper<JxglPerformanceAppraisal>().lambda()
+//							.eq(JxglPerformanceAppraisal::getId, appraisalUpdateSts.getId())
+//							.eq(JxglPerformanceAppraisal::getSts, appraisalUpdateSts.getSts()));
+			
 		JxglPerformanceAppraisal performanceAppraisal = jxglPerformanceAppraisalMapper
 				.selectOne(new QueryWrapper<JxglPerformanceAppraisal>().lambda()
-							.eq(JxglPerformanceAppraisal::getId, appraisalUpdateSts.getId())
-							.eq(JxglPerformanceAppraisal::getSts, appraisalUpdateSts.getSts()));
+						.eq(JxglPerformanceAppraisal::getId, appraisalUpdateSts.getId()));
 		
 			if (performanceAppraisal == null && appraisalUpdateSts.getSts() != PerformanceAppraisalSts.PERFORMANCE_ARCHIVE.getType()) {
 				return ResultUtil.error("绩效考核不存在");