Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

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

@@ -57,6 +57,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
                 appletServiceConfig.setAppId(e.getAppId());
                 appletServiceConfig.setName(e.getAppletConfigName());
                 appletServiceConfig.setType(AppletServiceConfigEnum.APPLET.getCode());
+                appletServiceConfig.setConfigId(e.getAppletConfigId());
                 appletServiceConfig.setCreateTime(new Date());
                 appletServiceConfig.setUpdateTime(new Date());
                 return appletServiceConfig;
@@ -78,6 +79,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
                 appletServiceConfig.setAppId(e.getAppId());
                 appletServiceConfig.setName(e.getServiceConfigName());
                 appletServiceConfig.setType(AppletServiceConfigEnum.SERVICE_CONFIG.getCode());
+                appletServiceConfig.setConfigId(e.getServiceConfigId());
                 appletServiceConfig.setCreateTime(new Date());
                 appletServiceConfig.setUpdateTime(new Date());
                 return appletServiceConfig;

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

@@ -142,7 +142,7 @@
   <insert id="insertList">
     insert into tab_applet_service_config (applet_service_id, enterprise_id, app_id,
       name, type, create_time,
-      update_time, status)
+      update_time, status, config_id)
     values
       <foreach collection="list" index="index" item="item" separator=",">
         (
@@ -153,7 +153,8 @@
         #{item.type,jdbcType=INTEGER},
         #{item.createTime,jdbcType=TIMESTAMP},
         #{item.updateTime,jdbcType=TIMESTAMP},
-        1
+        1,
+        #{item.configId,jdbcType=BIGINT}
         )
       </foreach>
 --     ON DUPLICATE KEY UPDATE name = VALUES(name)

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/AppletServiceConfigController.java

@@ -48,7 +48,7 @@ public class AppletServiceConfigController {
         if (channelResourceDTO == null || CollectionUtils.isEmpty(channelResourceDTO.getServiceConfigIdList())) {
             return RestResponse.success(new Page<>());
         }
-        appletServiceConfigQO.setConfigIdList(channelResourceDTO.getAppletConfigIdList());
+        appletServiceConfigQO.setConfigIdList(channelResourceDTO.getServiceConfigIdList());
         ServiceResponse<Page<AppletServiceConfigDTO>> serviceResponse = appletServiceConfigApiService.listService(UserDetailUtils.getUserDetail().getEnterpriseId(), appletServiceConfigQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }