From 6d868b48fe3aad995e8eabc364f04d1d53b74bee Mon Sep 17 00:00:00 2001
From: eric <465889110@qq.com>
Date: Thu, 25 Sep 2025 17:19:59 +0800
Subject: [PATCH] no message

---
 .../sync/service/impl/ReceiveServiceImpl.java |  2 --
 .../resources/mapper/CompanyInfoMapper.xml    | 23 ++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java
index ce8a87c..03e1353 100644
--- a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java
+++ b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java
@@ -302,8 +302,6 @@ public class ReceiveServiceImpl implements ReceiveService {
 
         if (companyInfoMapper.selectByOpId(companyInfo.getOperator_id()) != null) {
             companyInfoMapper.updateByOpId(companyInfo);
-        } else if (companyInfoMapper.selectByCompanyName(companyInfo.getCompany_name()) != null) {
-            companyInfoMapper.updateByCompanyName(companyInfo);
         } else {
             companyInfoMapper.insertCompanyInfo(companyInfo);
         }
diff --git a/src/main/resources/mapper/CompanyInfoMapper.xml b/src/main/resources/mapper/CompanyInfoMapper.xml
index ddee575..2696681 100644
--- a/src/main/resources/mapper/CompanyInfoMapper.xml
+++ b/src/main/resources/mapper/CompanyInfoMapper.xml
@@ -25,7 +25,7 @@
         <include refid="Base_Column_List" />
         FROM zc_company
         WHERE phone = #{phone}
-        AND is_delete = 0
+        AND del_flag = 0
     </select>
 
     <select id="selectByCompanyName" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -33,7 +33,7 @@
         <include refid="Base_Column_List" />
         FROM zc_company
         WHERE company_name = #{company_name}
-        AND is_delete = 0
+        AND del_flag = 0
     </select>
 
     <select id="selectById" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -49,7 +49,7 @@
         <include refid="Base_Column_List" />
         FROM zc_company
         WHERE b_op_id = #{bOpId}
-        AND is_delete = 0
+        AND del_flag = 0
     </select>
 
     <!-- 根据公司名称查询公司信息 -->
@@ -58,7 +58,7 @@
         <include refid="Base_Column_List" />
         FROM zc_company
         WHERE company_name = #{company_name}
-        AND is_delete = 0
+        AND del_flag = 0
     </select>
 
     <!-- 根据电话号码更新公司信息 -->
@@ -84,7 +84,10 @@
                 citys = #{citys},
             </if>
             <if test="isDelete != null">
-                is_delete = #{isDelete},
+                del_flag = #{is_delete},
+            </if>
+            <if test="is_delete != null">
+                is_delete = #{is_delete},
             </if>
             <if test="bOpId != null">
                 b_op_id = #{operator_id},
@@ -116,7 +119,10 @@
                 citys = #{citys},
             </if>
             <if test="isDelete != null">
-                is_delete = #{isDelete},
+                del_flag = #{is_delete},
+            </if>
+            <if test="is_delete != null">
+                is_delete = #{is_delete},
             </if>
             <if test="bOpId != null">
                 b_op_id = #{operator_id},
@@ -149,6 +155,9 @@
             <if test="citys != null and citys != ''">
                 citys = #{citys},
             </if>
+            <if test="is_delete != null">
+                del_flag = #{is_delete},
+            </if>
             <if test="is_delete != null">
                 is_delete = #{is_delete},
             </if>
@@ -170,6 +179,7 @@
             address,
             citys,
             is_delete,
+            del_flag,
             is_add_rules,
             sharing_ratio,
             wechat_receiving_account,
@@ -184,6 +194,7 @@
                      #{address},
                      #{citys},
                      #{is_delete},
+                     #{is_delete},
                     0,0,0,0,0,0
                  )
     </insert>