Browse Source

增加searchValue表示是否已经提交扩容申请。

wukai 2 năm trước cách đây
mục cha
commit
e955992521

+ 15 - 1
lzga-modules/lzga-doc/src/main/java/com/jjt/doc/controller/DocSpaceController.java

@@ -7,6 +7,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.jjt.common.security.annotation.InnerAuth;
 import com.jjt.common.security.utils.SecurityUtils;
+import com.jjt.doc.domain.DocSpaceExpand;
+import com.jjt.doc.service.IDocSpaceExpandService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -36,6 +38,8 @@ import com.jjt.common.core.web.page.TableDataInfo;
 public class DocSpaceController extends BaseController {
     @Resource
     private IDocSpaceService docSpaceService;
+    @Resource
+    private IDocSpaceExpandService expandService;
 
     /**
      * 查询存储空间列表
@@ -79,7 +83,17 @@ public class DocSpaceController extends BaseController {
         docSpace.setOwner(uid);
         docSpace.setSpaceType("3");
         List<DocSpace> list = docSpaceService.selectDocSpaceList(docSpace);
-        return success(list.get(0));
+        docSpace = list.get(0);
+        //查询是否有已申请扩容未审批的记录
+        DocSpaceExpand expand = new DocSpaceExpand();
+        expand.setSpaceId(docSpace.getSpaceId());
+        List expandList = expandService.selectDocSpaceExpandList(expand);
+        if (expandList.size() > 0) {
+            expand.setExpandStatus("1");
+        } else {
+            expand.setExpandStatus("0");
+        }
+        return success();
     }
 
     /**