Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!306

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

@@ -635,12 +635,14 @@ public class JxglController {
 //		}
 		if(appraisalUpdateSts.getSts() == 0) {//开启评分
 			List<JxglAppraisal> ais = JxglAppraisal.builder().build().selectList(new QueryWrapper<JxglAppraisal>().lambda().eq(JxglAppraisal::getPerformanceAppraisalId, appraisalUpdateSts.getId())
-					.eq(JxglAppraisal::getSts, 1));
+					.lt(JxglAppraisal::getSts, 2));
 			if(ais.size() == 0) {
 				return ResultUtil.error("已无可开启的绩效评分");
 			}
 		}else if(appraisalUpdateSts.getSts() == 1) {//开启结果确认
-			List<JxglAppraisal> ais = jxglAppraisalMapper.selectListByappraisalid(appraisalUpdateSts.getId());
+//			List<JxglAppraisal> ais = jxglAppraisalMapper.selectListByappraisalid(appraisalUpdateSts.getId());
+			List<JxglAppraisal> ais = JxglAppraisal.builder().build().selectList(new QueryWrapper<JxglAppraisal>().lambda().eq(JxglAppraisal::getPerformanceAppraisalId, appraisalUpdateSts.getId())
+					.lt(JxglAppraisal::getSts, 4));
 			if(ais.size() == 0) {
 				return ResultUtil.error("已无可开启的绩效结果确认");
 			}