From 203f4922eac31bed5061f8c4293146e60594343d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 30 Nov 2023 13:39:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E8=83=BD=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/controller/UserController.java       |  7 +++++--
 .../mybatis/mapper/GroupManagementMapper.xml  | 19 -------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java
index ef0ac366..42a710d1 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java
@@ -176,8 +176,11 @@ public class UserController {
                         groupManagementEntity.setUsingEntId(taxPlayerCodeDept.getDeptId());
                         groupManagementEntity.setCreateTime(new Date());
                         groupManagementEntity.setUpdateTime(new Date());
-                        groupManagementService.insertGroup(groupManagementEntity);
-
+                        int count = groupManagementService.insertGroup(groupManagementEntity);
+                        if (count == 0) {
+                            log.debug("同步开票组织管理---未执行插入补偿");
+                            groupManagementService.updateGroupByKey(groupManagementEntity);
+                        }
                         //新增redis缓存
                         String groupManagementStr = JSON.toJSONString(groupManagementEntity);
                         redisService.set(kpzzglKey, groupManagementStr, RedisConstant.REDIS_EXPIRE_TIME_7DAYS);
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml
index eaaf5f50..f90b88b3 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml
@@ -299,9 +299,6 @@
             <if test="groupManagementEntity.groupName != null">
                 group_name = #{groupManagementEntity.groupName,jdbcType=VARCHAR},
             </if>
-            <if test="groupManagementEntity.groupType != null">
-                group_type = #{groupManagementEntity.groupType,jdbcType=CHAR},
-            </if>
             <if test="groupManagementEntity.xhfMc != null">
                 xhf_mc = #{groupManagementEntity.xhfMc,jdbcType=VARCHAR},
             </if>
@@ -317,21 +314,6 @@
             <if test="groupManagementEntity.xhfZh != null">
                 xhf_zh = #{groupManagementEntity.xhfZh,jdbcType=VARCHAR},
             </if>
-            <if test="groupManagementEntity.dataSource != null">
-                data_source = #{groupManagementEntity.dataSource,jdbcType=CHAR},
-            </if>
-            <if test="groupManagementEntity.defaultItem != null">
-                is_default = #{groupManagementEntity.defaultItem,jdbcType=CHAR},
-            </if>
-            <if test="groupManagementEntity.dataStatus != null">
-                data_status = #{groupManagementEntity.dataStatus,jdbcType=CHAR},
-            </if>
-            <if test="groupManagementEntity.delFlag != null">
-                del_flag = #{groupManagementEntity.delFlag,jdbcType=CHAR},
-            </if>
-            <if test="groupManagementEntity.createTime != null">
-                create_time = #{groupManagementEntity.createTime,jdbcType=TIMESTAMP},
-            </if>
             <if test="groupManagementEntity.updateTime != null">
                 update_time = #{groupManagementEntity.updateTime,jdbcType=TIMESTAMP},
             </if>
@@ -340,6 +322,5 @@
         xhf_nsrsbh = #{groupManagementEntity.xhfNsrsbh,jdbcType=VARCHAR}
         and ent_id = #{groupManagementEntity.entId,jdbcType=VARCHAR}
         and del_flag = '0'
-        and data_source = '1'
     </update>
 </mapper>