Merge branch 'dev'
This commit is contained in:
commit
b30439de67
|
@ -83,10 +83,11 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
|
||||||
case "score":
|
case "score":
|
||||||
boolean score = Boolean.valueOf(params.get("score").toString());
|
boolean score = Boolean.valueOf(params.get("score").toString());
|
||||||
String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id";
|
String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id";
|
||||||
|
String resource_sql = "SELECT 1 FROM tb_data_resource WHERE tb_data_resource.del_flag = 0 AND t_ability_application.resource_id = tb_data_resource.id";
|
||||||
if (score) {
|
if (score) {
|
||||||
wrapper.exists(sql).ne("approve_status", "不通过");
|
wrapper.exists(sql).exists(resource_sql).ne("approve_status", "不通过");
|
||||||
} else {
|
} else {
|
||||||
wrapper.notExists(sql).ne("approve_status", "不通过");
|
wrapper.notExists(sql).exists(resource_sql).ne("approve_status", "不通过");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue