程序调整

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();

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'">