diff --git a/renren-admin/src/main/java/io/renren/modules/category/controller/CategoryController.java b/renren-admin/src/main/java/io/renren/modules/category/controller/CategoryController.java index 2776e800..aff804bf 100644 --- a/renren-admin/src/main/java/io/renren/modules/category/controller/CategoryController.java +++ b/renren-admin/src/main/java/io/renren/modules/category/controller/CategoryController.java @@ -69,7 +69,7 @@ public class CategoryController { if (ObjectUtils.isEmpty(categoryDTO.getPid())) { File file = new File(devModelFilePath + File.pathSeparator + categoryDTO.getName()); //文件路径不存在,创建各种能力的子文件夹 - if (! new File(devModelFilePath).exists()) { + if (! file.exists()) { try { file.createNewFile(); } catch (IOException e) { diff --git a/renren-admin/src/main/java/io/renren/modules/developmentGuide/controller/DevelopmentGuideController.java b/renren-admin/src/main/java/io/renren/modules/developmentGuide/controller/DevelopmentGuideController.java index 3ef4f4db..4a3da2f9 100644 --- a/renren-admin/src/main/java/io/renren/modules/developmentGuide/controller/DevelopmentGuideController.java +++ b/renren-admin/src/main/java/io/renren/modules/developmentGuide/controller/DevelopmentGuideController.java @@ -42,7 +42,7 @@ public class DevelopmentGuideController { @ApiImplicitParam(name = "type", value = "类型", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "resourceId", value = "能力ID", paramType = "query", required = false, dataType = "Long"), }) - public void getDevelopmentFile(@ApiIgnore HttpServletRequest request, @ApiIgnore HttpServletResponse response) { + public void getDevelopmentFile(HttpServletRequest request, HttpServletResponse response) { try { developmentGuideService.getDevelopmentFile(request, response); } catch (Exception e) { diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java index 517e9a39..99234598 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java @@ -77,6 +77,9 @@ public class ResourceDTO implements Serializable { private String isCollect; @ApiModelProperty(value = "评分") private Long score; + @ApiModelProperty(value = "申请结果") + private String applyState; + @ApiModelProperty(value = "属性信息") private List infoList;