修改遂宁线上测试问题

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

@@ -233,6 +233,11 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
             }
             if (apiResp.getData().get("siteTree") != null) {
                 List<SiteTreeSelectVO> resultList = JSONObject.parseArray(apiResp.getData().get("siteTree").toString(),SiteTreeSelectVO.class);
+                for (SiteTreeSelectVO item:resultList){
+                    if(StringUtils.isEmpty(item.getAreaName())){
+                        item.setAreaName(item.getLabel());
+                    }
+                }
                 SiteTreeSelectVO rootNode = new SiteTreeSelectVO();
                 rootNode.setId("6182157d00ce41559e001a89d87f4057");
                 rootNode.setAreaCode("510000000000");

sst-manager/src/main/resources/sqlmap/module/matter/MatterApplyMapperExt.xml

@@ -19,7 +19,7 @@
             </trim>
         </trim>
             GROUP BY
-                deptId
+                deptId,deptName
             ORDER BY
                 deptId
         ) as t
@@ -45,7 +45,7 @@
             </trim>
         </trim>
             GROUP BY
-                deptId
+                deptId,deptName
             ORDER BY
                 deptId
         ) as t
@@ -69,7 +69,7 @@
                 </trim>
             </trim>
             GROUP BY
-                themeCode
+                themeCode,themeName
             ORDER BY
                 themeCode
         ) as t
@@ -95,7 +95,7 @@
             </trim>
         </trim>
             GROUP BY
-                themeCode
+                themeCode,themeName
             ORDER BY
                 themeCode
         ) as t