Merge branch 'dev' into docker_package

This commit is contained in:
wangliwen 2022-07-19 09:53:52 +08:00
commit ee2e372c1f
1 changed files with 3 additions and 1 deletions

View File

@ -130,7 +130,9 @@ public class TAbilityApplicationController {
if (params.containsKey("ended")) {
index.setEnded(Boolean.valueOf(params.get("ended").toString()));
} else {
index.setEnded(false);
String sql = String.format("SELECT IF(COUNT(id) >0 ,TRUE,FALSE) AS ended FROM t_ability_application WHERE apply_flag = '%s' AND EXISTS (SELECT 1 FROM t_ability_application t1 WHERE t1.apply_flag = t_ability_application.apply_flag AND approve_status = '审核中');", index.getApplyFlag());
Boolean ended = jdbcTemplate.queryForObject(sql, Boolean.class);
index.setEnded(Boolean.valueOf(ended));
}
return index;
}).collect(Collectors.toList());