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

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/ThemeEnum.java

@@ -10,8 +10,8 @@ public enum ThemeEnum {
     BLACK_BLUE(1, "black-blue"),
     RED(2, "red"),
     BLACK_GOLDEN(3, "black-golden"),
-    DARK_GREEN(4, "dark_green"),
-    TINT_GREEN(5, "tint_green")
+    DARK_GREEN(4, "dark-green"),
+    TINT_GREEN(5, "tint-green")
     ;
 
     private Integer code;

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

@@ -107,9 +107,9 @@ public class CustomGuideApiServiceImpl implements CustomGuideApiService {
         } else if(theme == 3){
             themeStr = "black-golden";
         } else if(theme == 4){
-            themeStr = "dark_green";
+            themeStr = "dark-green";
         } else {
-            themeStr = "tint_green";
+            themeStr = "tint-green";
         }
         // networkTimeout
         Map<String, Object> networkTimeoutMap = new HashMap<String, Object>();
@@ -129,8 +129,8 @@ public class CustomGuideApiServiceImpl implements CustomGuideApiService {
             if(StringUtils.isNotBlank(guide.getIcon()) && !"{}".equals(guide.getIcon())){
                 JSONObject jsonObject = JSON.parseObject(guide.getIcon());
                 if(jsonObject != null){
-                    selectIconPath = iconPath + jsonObject.getString("type")+ jsonObject.getString("name")+"-active.png";
-                    unIconPath = iconPath + jsonObject.getString("type")+ jsonObject.getString("name")+".png";
+                    selectIconPath = iconPath + jsonObject.getString("type")+ "/"+jsonObject.getString("name")+"-active.png";
+                    unIconPath = iconPath + jsonObject.getString("type")+ "/"+jsonObject.getString("name")+".png";
                 }
             }
             listMap.put("selectedIconPath", selectIconPath);

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

@@ -263,8 +263,10 @@
     select
     t1.link_id, t1.create_time, t1.update_time, t1.parent_id, t1.status, t1.type, t1.object_type, t1.name, t1.h5_content,
     t1.applet_content, t1.is_custom
-    from tab_link t1 left join  tab_link_scene t2 on t1.link_id = t2.link_id
-    where (t1.enterprise_type = 1 or  (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} and t2.status = 1 ))
+    from tab_link t1 left join  (
+        select * from tab_link_scene where status = 1
+    ) t2 on t1.link_id = t2.link_id
+    where (t1.enterprise_type = 1 or  (t1.enterprise_type = 2 and t2.enterprise_id = #{enterpriseId} ))
     and t1.status = 1
     <if test="objectType != null ">
         <if test="objectType == 1">

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

@@ -18,6 +18,7 @@ import com.gic.member.config.api.dto.AppletCardRelationDTO;
 import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
 import com.gic.member.config.api.service.AppletsConfigApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -91,11 +92,13 @@ public class LinkController {
         if (serviceResponse.isSuccess()) {
             List<MallActivityThemeDTO> themeDTOList = serviceResponse.getResult().getResult();
             List<ActivityThemeVO> resultList = new ArrayList<>();
-            for (MallActivityThemeDTO mallActivityThemeDTO : themeDTOList) {
-                ActivityThemeVO themeVO = new ActivityThemeVO();
-                themeVO.setId(mallActivityThemeDTO.getId());
-                themeVO.setActivityName(mallActivityThemeDTO.getThemeName());
-                resultList.add(themeVO);
+            if (CollectionUtils.isNotEmpty(themeDTOList)) {
+                for (MallActivityThemeDTO mallActivityThemeDTO : themeDTOList) {
+                    ActivityThemeVO themeVO = new ActivityThemeVO();
+                    themeVO.setId(mallActivityThemeDTO.getId());
+                    themeVO.setActivityName(mallActivityThemeDTO.getThemeName());
+                    resultList.add(themeVO);
+                }
             }
             return RestResponse.success(resultList);
         } else {