From c8f27c0d9a6bba1dc9048d17be8883bfed041a22 Mon Sep 17 00:00:00 2001
From: syc <asda>
Date: Thu, 4 Aug 2022 10:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ProjectServiceImpl.java     |  8 ++++++++
 .../src/main/resources/mapper/ProjectDao.xml           | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index e8a73e8164..6d9da2cfcd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -3448,6 +3448,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public PageData<OrgProjectListResultDTO> orgProjectList(OrgProjectListFormDTO formDTO) {
 		//1.整理查询条件
+		if(StringUtils.isEmpty(formDTO.getOrgType())){
+			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+			if (null == staffInfo) {
+				throw new EpmetException("获取工作人员信息失败");
+			}
+			formDTO.setOrgId(staffInfo.getAgencyId());
+			formDTO.setOrgType("agency");
+		}
 		if (StringUtils.isNoneBlank(formDTO.getMobile())) {
 			//有手机号筛选条件的选按手机号查找工作人员，在按staffId查项目
 			GetByRealNamesFormDTO dto = new GetByRealNamesFormDTO();
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index cf692ea226..8258533b9a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -661,7 +661,14 @@
             ppc.public_reply
         FROM
             project p
-        INNER JOIN project_category pc ON p.id = pc.project_id
+            <!-- 项目分类现在是只能选一个二类，查询只查一个分类数据 -->
+        INNER JOIN (
+            select PROJECT_ID,category_pids,category_id
+            from project_category
+            where del_flag = '0' and customer_id = #{customerId}
+            group by project_id
+            ORDER BY created_time desc
+        )pc ON p.id = pc.project_id
         <if test="firstIdList != null and firstIdList.size() > 0"><!-- 一类查询条件 -->
             <foreach collection="firstIdList" item="firstId" open="AND pc.category_pids IN (" separator="," close=")">
                 #{firstId}
@@ -682,6 +689,7 @@
         </if>
         WHERE
             p.del_flag = '0'
+        AND p.customer_id = #{customerId}
         <if test="orgType != null and orgType != ''"><!-- 组织/网格对应查询条件 -->
             <choose>
                 <when test="orgType == 'agency'">