From 4eade083b90442b937eca412af0e5705f7a314c6 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Tue, 26 Apr 2022 09:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=9B=AE=E6=96=B0=E5=A2=9E=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB=E5=88=9B=E5=BB=BA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=8C=87=E5=8D=97=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renren/modules/category/controller/CategoryController.java | 2 +-
 .../controller/DevelopmentGuideController.java                 | 2 +-
 .../main/java/io/renren/modules/resource/dto/ResourceDTO.java  | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

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<AttrEntity> infoList;