同步修改

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabAppletServiceConfigMapper.java

@@ -65,6 +65,8 @@ public interface TabAppletServiceConfigMapper {
 
     TabAppletServiceConfig getAppByAppId(@Param("enterpriseId") Integer enterpriseId, @Param("appId") String appId);
 
+    TabAppletServiceConfig getByConfigId(@Param("enterpriseId") Integer enterpriseId, @Param("configId") Long configId);
+
     void updateTime(@Param("appId") String appId, @Param("type") int type, @Param("updateTime") Date date);
 
     void delByConfigIdList(@Param("ids") List<Long> configIdList, @Param("enterpriseId") Integer enterpriseId);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AppletServiceConfigServiceImpl.java

@@ -56,6 +56,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
         tabAppletServiceConfigMapper.delByConfigIdList(configIdList, enterpriseId);
 
         List<TabAppletServiceConfig> configList = Optional.ofNullable(responseResult).orElse(Collections.emptyList()).stream()
+                .filter(e -> tabAppletServiceConfigMapper.getByConfigId(enterpriseId, e.getAppletConfigId()) == null)
         .map(e -> {
             TabAppletServiceConfig appletServiceConfig = new TabAppletServiceConfig();
             appletServiceConfig.setEnterpriseId(enterpriseId);
@@ -79,7 +80,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
         tabAppletServiceConfigMapper.delByConfigIdList(configIdList, enterpriseId);
 
         List<TabAppletServiceConfig> configList = Optional.ofNullable(responseResult).orElse(Collections.emptyList()).stream()
-//            .filter(e -> tabAppletServiceConfigMapper.getAppByAppId(enterpriseId, e.getAppId()) == null)
+            .filter(e -> tabAppletServiceConfigMapper.getByConfigId(enterpriseId, e.getServiceConfigId()) == null)
         .map(e -> {
             TabAppletServiceConfig appletServiceConfig = new TabAppletServiceConfig();
             appletServiceConfig.setEnterpriseId(enterpriseId);

gic-platform-enterprise-service/src/main/resources/mapper/TabAppletServiceConfigMapper.xml

@@ -185,6 +185,14 @@
     and enterprise_id = #{enterpriseId}
     and status = 1
   </select>
+  <select id="getByConfigId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_applet_service_config
+    where config_id = #{configId}
+    and enterprise_id = #{enterpriseId}
+    and status = 1
+  </select>
   <update id="delByAppIdList">
     update tab_applet_service_config set status = 0
     where enterprise_id = #{enterpriseId}