diff --git a/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java b/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java index 0d49cd9..0f735ad 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java +++ b/src/main/java/com/sztzjy/resource_center/controller/api/ResourceApi.java @@ -144,10 +144,9 @@ public class ResourceApi { @ApiOperation("根据章节查看资源文件列表") @PostMapping("selectResourceByChapterId") public List<SysResourceDto> selectResourceByChapterId(@RequestParam String oneId, //这里传的是一级的名称 - @RequestParam String threeId, - @RequestParam String source) { + @RequestParam String threeId) { SysOneCatalog sysOneCatalogs = getSysOneCatalogs(oneId); - return sysResourceMapper.selectResource(sysOneCatalogs.getOneId(), null, threeId, source); + return sysResourceMapper.selectResource(sysOneCatalogs.getOneId(), null, threeId, null); } diff --git a/src/main/java/com/sztzjy/resource_center/entity/admin/AdminCaseReturnDto.java b/src/main/java/com/sztzjy/resource_center/entity/admin/AdminCaseReturnDto.java index 9be0976..f9a1f02 100644 --- a/src/main/java/com/sztzjy/resource_center/entity/admin/AdminCaseReturnDto.java +++ b/src/main/java/com/sztzjy/resource_center/entity/admin/AdminCaseReturnDto.java @@ -33,6 +33,9 @@ public class AdminCaseReturnDto { @ApiModelProperty("目录") private String catalog; + @ApiModelProperty("来源") + private String source; + @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date createTime; diff --git a/src/main/resources/mapper/SysCaseQuestionMapper.xml b/src/main/resources/mapper/SysCaseQuestionMapper.xml index a62f107..2d3a50c 100644 --- a/src/main/resources/mapper/SysCaseQuestionMapper.xml +++ b/src/main/resources/mapper/SysCaseQuestionMapper.xml @@ -456,7 +456,7 @@ <!--条件查询加绑定关系,有重复数据--> <select id="selectCaseByConditionsByBind" parameterType="java.lang.String" resultMap="BaseResultMap"> - select st.*,s.case_id,s.title,s.content,s.resource_data,s.source,s.type,s.unmount_status,s.create_time,s.update_time + select st.one_id,st.one_name,st.two_id,st.two_name,st.three_id,st.three_name,s.case_id,s.title,s.content,s.resource_data,s.source,s.type,s.unmount_status,s.create_time,s.update_time from sys_case_questions s left join sys_topic_and_course st on s.case_id = st.topic_id