From 86bd9ebc9cf65bcd5993f9f032e164db21fcf5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 4 Jul 2023 17:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E6=98=AF?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=9A=84=E5=AE=A2=E6=88=B7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BA=E6=82=A3=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/BasicCorpController.java    | 8 ++++++--
 .../api/req/basic/BasicUnitMaintainFilterRequest.java     | 1 +
 src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml  | 7 +++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
index 8277778d6..aada9dbca 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
@@ -81,7 +81,7 @@ public class BasicCorpController {
         //是供应商的时候拉客户和供应商
         if (basicUnitMaintainFilterRequest.getCorpType() == null || basicUnitMaintainFilterRequest.getCorpType() == 2) {
             basicUnitMaintainFilterRequest.setCorpType(null);
-            basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2)));
+            basicUnitMaintainFilterRequest.setCorpTypeLists(new ArrayList<>(Arrays.asList(1, 2)));
         }
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
@@ -126,7 +126,11 @@ public class BasicCorpController {
         BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity();
         BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
         basicUnitMaintainEntity.setErpId(CustomUtil.getId());
-        basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
+        if(basicUnitMaintainSaveRequest.getCorpType()==1){
+            basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
+        }else{
+            basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
+        }
         basicUnitMaintainEntity.setUpdateTime(new Date());
         basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId());
         boolean b = basicUnitMaintainService.insert(basicUnitMaintainEntity);
diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java
index 5988d335f..2b6ede471 100644
--- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java
@@ -27,5 +27,6 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest {
     private Boolean isDownThrSys;
     private String lastUpdateTime;
     private List<Integer> corpTypeList;
+    private List<Integer> corpTypeLists;//用来往来单位查询
     List<BasicErpUnitsResponse>thrCorpEntities;
 }
diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
index e7ce1c290..0d87032a9 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
@@ -37,6 +37,13 @@
                 </foreach>
                 ) and outType <![CDATA[ <> ]]> 1
             </if>
+            <if test="corpTypeLists != null and corpTypeLists.size() > 0">
+                AND (corpType in
+                <foreach item="item" index="index" collection="corpTypeLists" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                )
+            </if>
             <if test="outType != null">
                 AND (outType <![CDATA[ <> ]]> #{outType} or outType is NULL)
             </if>