Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java

@@ -376,7 +376,7 @@ public class DeclaredProjectManage {
     public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) {
         UserInfoDetails userFullInfo = LoginUserUtil.loginUserDetail();
         VUtils.isTrue(Objects.isNull(userFullInfo)).throwMessage("获取登录用户失败!");
-        //放入用户的单位
+        //放入用户的单位 因为数据权限 只能看自己单位
         req.setBuildOrgCode(userFullInfo.getOrganizationCode());
         return projectlibManager.projectLibList(req);
     }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java

@@ -2,15 +2,19 @@ package com.ningdatech.pmapi.projectdeclared.manage;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum;
 import com.ningdatech.pmapi.common.helper.UserInfoHelper;
+import com.ningdatech.pmapi.datascope.model.DataScopeDTO;
+import com.ningdatech.pmapi.datascope.utils.DataScopeUtil;
 import com.ningdatech.pmapi.organization.model.entity.DingOrganization;
 import com.ningdatech.pmapi.organization.service.IDingOrganizationService;
 import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO;
 import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO;
 import com.ningdatech.pmapi.projectdeclared.service.IDeclaredStatisticsService;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst;