Merge remote-tracking branch 'origin/developer' into developer

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

@@ -69,5 +69,5 @@ public interface TabAppletServiceConfigMapper {
 
     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);
+    void delByConfigIdList(@Param("ids") List<Long> configIdList, @Param("enterpriseId") Integer enterpriseId, @Param("type") int type);
 }
\ No newline at end of file

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

@@ -53,7 +53,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
         // 先删除configId不在入参里的 如果入参是空的 就全部删除
         List<Long> configIdList = Optional.ofNullable(responseResult).orElse(Collections.emptyList())
                 .stream().map(AppletsConfigSimpleOutputDTO::getAppletConfigId).collect(Collectors.toList());
-        tabAppletServiceConfigMapper.delByConfigIdList(configIdList, enterpriseId);
+        tabAppletServiceConfigMapper.delByConfigIdList(configIdList, enterpriseId, AppletServiceConfigEnum.APPLET.getCode());
 
         List<TabAppletServiceConfig> configList = Optional.ofNullable(responseResult).orElse(Collections.emptyList()).stream()
                 .filter(e -> tabAppletServiceConfigMapper.getByConfigId(enterpriseId, e.getAppletConfigId()) == null)
@@ -77,7 +77,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
     public void syncServiceConfig(List<ServiceConfigSimpleOutputDTO> responseResult, Integer enterpriseId) {
         List<Long> configIdList = Optional.ofNullable(responseResult).orElse(Collections.emptyList())
                 .stream().map(ServiceConfigSimpleOutputDTO::getServiceConfigId).collect(Collectors.toList());
-        tabAppletServiceConfigMapper.delByConfigIdList(configIdList, enterpriseId);
+        tabAppletServiceConfigMapper.delByConfigIdList(configIdList, enterpriseId, AppletServiceConfigEnum.SERVICE_CONFIG.getCode());
 
         List<TabAppletServiceConfig> configList = Optional.ofNullable(responseResult).orElse(Collections.emptyList()).stream()
             .filter(e -> tabAppletServiceConfigMapper.getByConfigId(enterpriseId, e.getServiceConfigId()) == null)

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

@@ -211,7 +211,7 @@
   </update>
 <!--  delByConfigIdList-->
   <update id="delByConfigIdList">
-    update tab_applet_service_config set status = 0 where enterprise_id = #{enterpriseId}
+    update tab_applet_service_config set status = 0 where enterprise_id = #{enterpriseId} and type = #{type}
     <if test="null != ids and ids.size > 0">
       and config_id not in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">