appnav

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/extensions/service/SysAppService.java

@@ -42,12 +42,15 @@ public class SysAppService extends SysAppServiceImpl
     private UAACoreService uaaCoreService;
 
 
-    @Cacheable( value="ibzuaa_appnavbar",key = "'id:'+#p0+'||'+#p1")
-    public JSONObject getAppNavigationBar(String navId,String userId)
+    @Cacheable( value="ibzuaa_switcher",key = "'id:'+#p0+'||'+#p1")
+    public JSONObject getAppSwitcher(String id,String userId)
     {
-        JSONObject jo=ibzConfigService.getConfig("AppNavigationBar",navId, userId);
-        if(!jo.containsKey("model"))
-            jo.put("model",new JSONArray());
+        JSONObject jo=ibzConfigService.getConfig("AppSwitcher",id, userId);
+        boolean nullSwitcher=false;
+        if(!jo.containsKey("model")) {
+            jo.put("model", new JSONArray());
+            nullSwitcher=true;
+        }
         LinkedHashMap<String,SysApp> defApps=uaaCoreService.getApps();
         List<SysApp> list=new ArrayList<>();
         JSONArray.parseArray(jo.get("model").toString(),SysApp.class).forEach(sysApp -> {
@@ -58,11 +61,16 @@ public class SysAppService extends SysAppServiceImpl
             sysApp.setFullname(def.getFullname());
             sysApp.setType(def.getType());
             sysApp.setVisabled(1);
+            sysApp.setGroup(def.getGroup());
             list.add(sysApp);
             defApps.remove(def.getId());
         });
+        final boolean flag=nullSwitcher;
         defApps.values().forEach(sysApp -> {
-            sysApp.setVisabled(0);
+            if(flag&&id.equalsIgnoreCase("default"))
+                sysApp.setVisabled(1);
+            else
+                sysApp.setVisabled(0);
             list.add(sysApp);
         });
         jo.remove("model");
@@ -70,7 +78,7 @@ public class SysAppService extends SysAppServiceImpl
         return jo;
     }
 
-    @CacheEvict( value="ibzuaa_appnavbar",allEntries=true)
+    @CacheEvict( value="ibzuaa_switcher",allEntries=true)
     public void resetAppNavigationBars()
     {
 

ibzuaa-core/src/main/resources/mapper/uaa/syspssystem/SysPSSystemMapper.xml

@@ -14,6 +14,11 @@
 
     </resultMap>
 
+    <select id="searchPick"  parameterType="cn.ibizlab.core.uaa.filter.SysPSSystemSearchContext"  >
+        SELECT t1.PSSYSTEMID,t1.SHOWORDER FROM IBZPSSYSTEM t1
+        <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+    </select>
 
     <!--数据集合[Default]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.core.uaa.filter.SysPSSystemSearchContext"  resultMap="SysPSSystemResultMap">

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/ClientAuthenticationResource.java

@@ -71,10 +71,10 @@ public class ClientAuthenticationResource
     @Autowired
     private SysAppService sysAppService;
 
-    @GetMapping(value = "uaa/access-center/nav/{id}")
-    public ResponseEntity<JSONObject> appnavbar(@PathVariable("id") String id)
+    @GetMapping(value = "uaa/access-center/app-switcher/{id}")
+    public ResponseEntity<JSONObject> appswitcher(@PathVariable("id") String id)
     {
-        return ResponseEntity.ok(sysAppService.getAppNavigationBar(id,AuthenticationUser.getAuthenticationUser().getUserid()));
+        return ResponseEntity.ok(sysAppService.getAppSwitcher(id,AuthenticationUser.getAuthenticationUser().getUserid()));
     }
 
 }