Merge branch 'refs/heads/zcwy0622-yang' into dev0525

This commit is contained in:
yang
2024-07-01 11:14:36 +08:00
3 changed files with 4 additions and 4 deletions

View File

@@ -259,7 +259,7 @@ public class ThirdApi {
HttpRequest.get(url).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败"));
Gson gson = new Gson();
CheckExamBandingBean checkExamBandingBean = gson.fromJson(resp, CheckExamBandingBean.class);
return checkExamBandingBean.getData();
return checkExamBandingBean.getData().toString();
}
}

View File

@@ -23,7 +23,7 @@ public class CheckExamBandingBean {
private String version;
private int code;
private String msg;
private String data;
private Object data;
private boolean success;
public CheckExamBandingBean success() {

View File

@@ -147,8 +147,8 @@ public class ExamTestApi extends ApiBaseController {
try {
String bandInfo = thirdApi.checkExamBanding(id, token);
if (StringUtils.isNotBlank(bandInfo)){
return error("删除失败",bandInfo);
if (StringUtils.isNotBlank(bandInfo) && !bandInfo.equals("{}")){
return error("删除失败"+bandInfo);
}
examTestService.delete(id);
return success(true);