From 8ae137192b11ada33c072a0af756849af1e6fe6e Mon Sep 17 00:00:00 2001
From: guixinman <2863174261@qq.com>
Date: Fri, 25 Jul 2025 15:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=9C=B0=E5=9D=80list?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../position/dao/PositionAddressMapper.java   |  6 ++++++
 .../position/dto/PositionAddressQueryDTO.java |  2 ++
 .../position/mapper/PositionAddressMapper.xml | 20 +++++++++++++++++++
 .../impl/PositionAddressServiceImpl.java      | 15 +++++---------
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/newyetai/recruit/position/dao/PositionAddressMapper.java b/src/main/java/com/newyetai/recruit/position/dao/PositionAddressMapper.java
index 65b2471..a9d182e 100644
--- a/src/main/java/com/newyetai/recruit/position/dao/PositionAddressMapper.java
+++ b/src/main/java/com/newyetai/recruit/position/dao/PositionAddressMapper.java
@@ -1,8 +1,13 @@
 package com.newyetai.recruit.position.dao;
 
 
+import com.newyetai.recruit.position.dto.PositionAddressDTO;
+import com.newyetai.recruit.position.dto.PositionAddressQueryDTO;
 import com.newyetai.recruit.position.entity.PositionAddress;
 import com.newyetai.tkmybatis.mybatis.MyMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -13,4 +18,5 @@ import com.newyetai.tkmybatis.mybatis.MyMapper;
  */
 public interface PositionAddressMapper extends MyMapper<PositionAddress> {
 
+  List<PositionAddressDTO> list(@Param("param") PositionAddressQueryDTO queryDTO);
 }
diff --git a/src/main/java/com/newyetai/recruit/position/dto/PositionAddressQueryDTO.java b/src/main/java/com/newyetai/recruit/position/dto/PositionAddressQueryDTO.java
index 3048578..24ab9f5 100644
--- a/src/main/java/com/newyetai/recruit/position/dto/PositionAddressQueryDTO.java
+++ b/src/main/java/com/newyetai/recruit/position/dto/PositionAddressQueryDTO.java
@@ -33,4 +33,6 @@ public class PositionAddressQueryDTO implements Serializable {
   @ApiModelProperty("ID集合")
   private Set<Long> ids;
 
+  private Long orgId;
+
 }
diff --git a/src/main/java/com/newyetai/recruit/position/mapper/PositionAddressMapper.xml b/src/main/java/com/newyetai/recruit/position/mapper/PositionAddressMapper.xml
index f04f685..84a070b 100644
--- a/src/main/java/com/newyetai/recruit/position/mapper/PositionAddressMapper.xml
+++ b/src/main/java/com/newyetai/recruit/position/mapper/PositionAddressMapper.xml
@@ -2,4 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.newyetai.recruit.position.dao.PositionAddressMapper">
 
+    <select id="list" resultType="com.newyetai.recruit.position.dto.PositionAddressDTO">
+        select
+            t.*
+        from
+            hr_position_address t
+        inner join hr_company hc on t.company_id = hc.id and hc.deleted = 0
+        where t.deleted = 0
+        <if test='param.orgId != null'>
+            AND hc.org_id = #{param.orgId}
+        </if>
+        <if test='param.companyId != null'>
+            AND t.company_id = #{param.companyId}
+        </if>
+        <if test="param.ids != null and param.ids.size()>0">
+            AND t.id in
+            <foreach collection="param.ids" open="(" separator="," close=")" item="id">
+                #{id}
+            </foreach>
+        </if>
+    </select>
 </mapper>
diff --git a/src/main/java/com/newyetai/recruit/position/service/impl/PositionAddressServiceImpl.java b/src/main/java/com/newyetai/recruit/position/service/impl/PositionAddressServiceImpl.java
index 554be35..2c40d03 100644
--- a/src/main/java/com/newyetai/recruit/position/service/impl/PositionAddressServiceImpl.java
+++ b/src/main/java/com/newyetai/recruit/position/service/impl/PositionAddressServiceImpl.java
@@ -2,6 +2,7 @@ package com.newyetai.recruit.position.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.newyetai.common.constant.CommonConstants;
 import com.newyetai.common.exception.BusinessException;
 import com.newyetai.common.exception.util.Assert;
 import com.newyetai.common.util.SensitiveWordUtils;
@@ -62,18 +63,12 @@ public class PositionAddressServiceImpl implements PositionAddressService {
 
   @Override
   public List<PositionAddressDTO> list(PositionAddressQueryDTO queryDTO) {
-    LambdaQueryWrapper<PositionAddress> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-    lambdaQueryWrapper.eq(PositionAddress::getDeleted, false);
-
-
-    if (Objects.nonNull(queryDTO.getCompanyId())) {
-      lambdaQueryWrapper.eq(PositionAddress::getCompanyId, queryDTO.getCompanyId());
-    }
-    if (CollUtil.isNotEmpty(queryDTO.getIds())) {
-      lambdaQueryWrapper.in(PositionAddress::getId, queryDTO.getIds());
+    if (!CommonConstants.PLATFORM_ORG_ID.equals(UserContextHolder.getExistLoginOrgId())) {
+      queryDTO.setOrgId(UserContextHolder.getLoginOrgId());
     }
 
-    List<PositionAddress> positionAddresses = positionAddressMapper.selectList(lambdaQueryWrapper);
+    List<PositionAddressDTO> positionAddresses = positionAddressMapper.list(queryDTO);
+
     if (CollUtil.isNotEmpty(positionAddresses)) {
       return positionAddresses.stream().map(positionAddress -> {
         PositionAddressDTO positionAddressDTO = new PositionAddressDTO();