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 @@
FROM zc_company
WHERE phone = #{phone}
- AND is_delete = 0
+ AND del_flag = 0
@@ -58,7 +58,7 @@
FROM zc_company
WHERE company_name = #{company_name}
- AND is_delete = 0
+ AND del_flag = 0
@@ -84,7 +84,10 @@
citys = #{citys},
- is_delete = #{isDelete},
+ del_flag = #{is_delete},
+
+
+ is_delete = #{is_delete},
b_op_id = #{operator_id},
@@ -116,7 +119,10 @@
citys = #{citys},
- is_delete = #{isDelete},
+ del_flag = #{is_delete},
+
+
+ is_delete = #{is_delete},
b_op_id = #{operator_id},
@@ -149,6 +155,9 @@
citys = #{citys},
+
+ del_flag = #{is_delete},
+
is_delete = #{is_delete},
@@ -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
)