bug修改

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterApplyServiceImpl.java

@@ -8,6 +8,7 @@ import com.mortals.xhx.common.pdu.matter.MatterPdu;
 import com.mortals.xhx.common.pdu.site.SiteMatterPdu;
 import com.mortals.xhx.common.pdu.site.SiteThemeMatterPdu;
 import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.feign.matter.IMatterDatumFeign;
 import com.mortals.xhx.feign.matter.IMatterFeign;
 import com.mortals.xhx.feign.site.ISiteMatterFeign;
@@ -172,6 +173,12 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
                     }
                     singleEntity.setThemeCode(themeCode.endsWith(",")?themeCode.substring(0,themeCode.indexOf(",")):themeCode);
                     singleEntity.setThemeName(themeName.endsWith(",")?themeName.substring(0,themeName.indexOf(",")):themeName);
+                    if(StringUtils.isEmpty(singleEntity.getThemeCode())){
+                        singleEntity.setThemeCode("999");
+                    }
+                    if(StringUtils.isEmpty(singleEntity.getThemeName())){
+                        singleEntity.setThemeName("其他");
+                    }
                 }
                 MatterDatumPdu datumPdu = new MatterDatumPdu();
                 datumPdu.setMatterId(item.getMatterId());

sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstBasicController.java

@@ -358,32 +358,40 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
         String busiDesc = "查询自助终端应用展示数据" ;
         int code=1;
         try {
-            String host = "";
-            String serverName = request.getHeader("server-name");
-            Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"),0);
-            if (!ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
-                host = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).build();
-                //host = StrUtil.sub(host, 0, host.length() - 1);
+            if(query.getSiteId()==null){
+                model.put("showApps", Collections.emptyList());
+                model.put("hotApps", Collections.emptyList());
+                model.put("allApps", Collections.emptyList());
+                model.put("appThemeCount", new HashMap<>());
             }else {
-                host="";
-            }
-            if(StringUtils.isNotEmpty(query.getAppName())){
-                query.setAppName("%"+query.getAppName()+"%");
-            }
-            log.info("server-name:"+serverName+",server-port:"+serverPort);
-            Map<String, Object> sstApps = sstAppsService.getAppListBySite(query.getDeviceCode(),query.getSiteId(),host,query.getAppName());
-            model.put("showApps", sstApps.get("showApps"));
-            model.put("hotApps", sstApps.get("hotApps"));
-            model.put("allApps", sstApps.get("allApps"));
-            model.put("appThemeCount",groupAppTheme((List<AppsInfoEntity>)sstApps.get("showApps")));
-            AppPdu appPdu = new AppPdu();
-            appPdu.setSiteId(query.getSiteId());
-            appPdu.setSize(999);
-            appPdu.setType(1);
-            appPdu.setShelves(1);
-            Rest<RespData<List<AppPdu>>> rest = appFeign.list(appPdu);
-            if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
-                model.put("dict",rest.getData().getDict());
+                String host = "";
+                String serverName = request.getHeader("server-name");
+                Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0);
+                if (!ObjectUtils.isEmpty(serverName) && Validator.isIpv4(serverName)) {
+                    host = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).build();
+                    //host = StrUtil.sub(host, 0, host.length() - 1);
+                } else {
+                    host = "";
+                }
+                if (StringUtils.isNotEmpty(query.getAppName())) {
+                    query.setAppName("%" + query.getAppName() + "%");
+                }
+                log.info("server-name:" + serverName + ",server-port:" + serverPort);
+                Map<String, Object> sstApps = sstAppsService.getAppListBySite(query.getDeviceCode(), query.getSiteId(), host, query.getAppName());
+                model.put("showApps", sstApps.get("showApps"));
+                model.put("hotApps", sstApps.get("hotApps"));
+                model.put("allApps", sstApps.get("allApps"));
+                model.put("appThemeCount", groupAppTheme((List<AppsInfoEntity>) sstApps.get("showApps")));
+                AppPdu appPdu = new AppPdu();
+                appPdu.setSiteId(query.getSiteId());
+                appPdu.setSize(999);
+                appPdu.setType(1);
+                appPdu.setShelves(1);
+                Rest<RespData<List<AppPdu>>> rest = appFeign.list(appPdu);
+                if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
+                    model.put("dict", rest.getData().getDict());
+                }
+
             }
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");