diff --git a/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java b/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java
index 5430e9d..819fbcc 100644
--- a/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java
+++ b/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java
@@ -1772,6 +1772,24 @@ public class ScriptImpl implements IScript {
 		return SubCalcUtils.subFieldNotContain(subArray, field, op, value, dateType);
 	}
 
+	/**
+	 * 当前用户组织信息
+	 * @param type
+	 * @return
+	 */
+	public String getOrgIds(String type){
+		StringBuilder sb = new StringBuilder();
+		ArrayList<String> dataPermission = getDataPermission(type);
+		if (dataPermission != null && dataPermission.size() > 0) {
+			for (String orgId : dataPermission) {
+				sb.append(orgId).append(",");
+			}
+			String orgIds = sb.substring(0,sb.length()-1);
+			return orgIds;
+		} else {
+			return "";
+		}
+	}
 	//当前登陆用户的ID
 	private static final String LOGIN_USER = "loginUser";
 	//当前登陆用户所属组织的ID
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
index 81d2aea..5064cad 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
@@ -10,11 +10,14 @@ import com.hotent.base.model.CommonResult;
 import com.hotent.base.util.StringUtil;
 import com.hotent.chkpower.manager.WProjectLibraryInventoryManager;
 import com.hotent.chkpower.model.WProjectLibraryInventory;
+import com.hotent.chkpower.model.enums.ProjectStateEnum;
+import com.hotent.runtime.script.ScriptImpl;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.net.URLEncoder;
@@ -35,6 +38,9 @@ import java.util.List;
 @RequestMapping("/wProjectLibraryInventory/v1/")
 public class WProjectLibraryInventoryController extends BaseController<WProjectLibraryInventoryManager, WProjectLibraryInventory> {
 
+    @Resource
+    private ScriptImpl script;
+
     /**
      * 根据id获取项目库清单数据详情
      *
@@ -67,6 +73,17 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL
     @GetMapping("/down")
     @ApiOperation(value = "项目库导出", httpMethod = "GET", notes = "项目库导出：根据查询条件导出Excle表格")
     public void down(HttpServletResponse response, WProjectLibraryInventory wProjectLibraryInventory) throws Exception {
+        if (ObjectUtils.isEmpty(wProjectLibraryInventory.getExportType())) {
+            throw new RuntimeException("请传入参数exportType");
+        }
+        ArrayList<String> projectState = new ArrayList<>();
+        if ("1".equals(wProjectLibraryInventory.getExportType())) {
+            projectState.add(ProjectStateEnum.dairuku.getInfo());
+            projectState.add(ProjectStateEnum.yizuofei.getInfo());
+        } else {
+            projectState.add(ProjectStateEnum.yiruku.getInfo());
+            projectState.add(ProjectStateEnum.yichuku.getInfo());
+        }
         QueryWrapper<WProjectLibraryInventory> queryWrapper = new QueryWrapper<>();
         if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getFProjectNo())) {
             queryWrapper.eq("F_project_no", wProjectLibraryInventory.getFProjectNo());
@@ -79,6 +96,8 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL
         }
         if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getFProjectState())) {
             queryWrapper.eq("F_project_state", wProjectLibraryInventory.getFProjectState());
+        } else {
+            queryWrapper.in("F_project_state", projectState);
         }
         if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getCreateTime())) {
             queryWrapper.like("F_create_time", wProjectLibraryInventory.getCreateTime());
@@ -98,6 +117,10 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL
         if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getUpdateTime())) {
             queryWrapper.like("F_update_time", wProjectLibraryInventory.getUpdateTime());
         }
+        ArrayList<String> orgIds = script.getDataPermission("loginUserAllSubOrgs");
+        if (ObjectUtils.isNotEmpty(orgIds)) {
+            queryWrapper.in("F_org_id", orgIds);
+        }
         List<WProjectLibraryInventory> list = baseService.list(queryWrapper);
         HashMap<String, Object> map = new HashMap<>();
         ArrayList<HashMap> hashMaps = new ArrayList<>();
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
index 9cccb54..5fc07db 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
@@ -247,7 +247,16 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory
     private String createTime;
     @TableField(exist = false)
     private String updateTime;
+    @TableField(exist = false)
+    private String exportType;// 1=项目填报，2=项目库
+
+    public String getExportType() {
+        return exportType;
+    }
 
+    public void setExportType(String exportType) {
+        this.exportType = exportType;
+    }
 
     public String getId() {
         return id;
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/ProjectStateEnum.java b/backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/ProjectStateEnum.java
new file mode 100644
index 0000000..8eedec7
--- /dev/null
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/model/enums/ProjectStateEnum.java
@@ -0,0 +1,38 @@
+package com.hotent.chkpower.model.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 安检类型
+ */
+@AllArgsConstructor
+@Getter
+public enum ProjectStateEnum {
+
+    /**
+     * 待入库
+     */
+    dairuku("dairuku", "待入库"),
+
+    /**
+     * 已作废
+     */
+    yizuofei("yizuofei", "已作废"),
+
+    /**
+     * 已入库
+     */
+    yiruku("yiruku", "已入库"),
+
+
+    /**
+     * 已出库
+     */
+    yichuku("yichuku", "已出库"),
+
+    ;
+
+    private final String code;
+    private final String info;
+}
--
libgit2 0.21.2