移动端首页授权后，未授权应用的插件排除

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.java

@@ -26,17 +26,19 @@ import java.util.List;
 @Mapper
 public interface AppSubsetVersionMapper extends BaseMapper<AppSubsetVersion> {
 
-	List<AppSubsetVersionVo> selectVersionList(@Param("linkSid") String linkSid,@Param("path") String path);
+    List<AppSubsetVersionVo> selectVersionList(@Param("linkSid") String linkSid, @Param("path") String path);
 
-	AppSubsetVersionVo selectByAppSid(String appSid);
+    List<AppSubsetVersionVo> selectVersionListOne(@Param("linkSid") String linkSid, @Param("path") String path, @Param("list") List<String> stringList);
 
-	@Select("SELECT * FROM app_subset_version WHERE modulePluginName=#{modulePluginName} ORDER BY id DESC LIMIT 1")
-	AppSubsetVersionVo getLastBymodulePluginName(@Param("modulePluginName") String modulePluginName);
+    AppSubsetVersionVo selectByAppSid(String appSid);
 
-	@Select("SELECT * FROM app_subset_version WHERE appSid=#{appSid} ORDER BY id DESC LIMIT 1")
-	AppSubsetVersionVo getLastByAppSid(@Param("appSid") String appSid);
+    @Select("SELECT * FROM app_subset_version WHERE modulePluginName=#{modulePluginName} ORDER BY id DESC LIMIT 1")
+    AppSubsetVersionVo getLastBymodulePluginName(@Param("modulePluginName") String modulePluginName);
 
-	AppSubsetVersionVo selectByAppSidOne(String s);
+    @Select("SELECT * FROM app_subset_version WHERE appSid=#{appSid} ORDER BY id DESC LIMIT 1")
+    AppSubsetVersionVo getLastByAppSid(@Param("appSid") String appSid);
 
-	List<AppIndexAppNumVo> selectAppNum(String linkSid);
+    AppSubsetVersionVo selectByAppSidOne(String s);
+
+    List<AppIndexAppNumVo> selectAppNum(String linkSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionMapper.xml

@@ -24,6 +24,34 @@
           AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid)
         ORDER BY sortNo ASC
     </select>
+
+    <select id="selectVersionListOne" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
+        SELECT asv.sortNo,
+        asv.appName,
+        asv.appSid,
+        asv.versionCode,
+        concat(#{path}, asv.iconUrl)   iconUrl,
+        asv.linkSid,
+        asv.versionName,
+        concat(#{path}, asv.updateUrl) updateUrl,
+        asv.upgradeInfo,
+        asv.type,
+        asv.modulePluginName,
+        asv.sourcePackage,
+        asv.sourceAction,
+        asv.sourceSid,
+        asv.`id`
+        FROM app_subset_version asv
+        WHERE linkSid = #{linkSid}
+        AND id IN (SELECT MAX(id) FROM app_subset_version GROUP BY appSid)
+        <if test="list != null and list.size()!=0">
+            and asv.appSid in
+            <foreach item="appSid" collection="list" open="(" separator="," close=")">
+                #{appSid}
+            </foreach>
+        </if>
+        ORDER BY sortNo ASC
+    </select>
     <select id="selectByAppSid" resultType="com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo">
         SELECT versionCode
         FROM app_subset_version

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionService.java

@@ -28,6 +28,10 @@ public class AppSubsetVersionService extends MybatisBaseService<AppSubsetVersion
 		return baseMapper.selectVersionList(linkSid,path);
 	}
 
+	public List<AppSubsetVersionVo> selectVersionListOne(String linkSid,String path,List<String> stringList) {
+		return baseMapper.selectVersionListOne(linkSid,path,stringList);
+	}
+
 	public AppSubsetVersionVo selectByAppSid(String appSid) {
 		return baseMapper.selectByAppSid(appSid);
 	}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java

@@ -90,7 +90,11 @@ public class AppIndexRest implements AppIndexFeign {
         // 子应用列表
         String linkSid = LINKSID;
         String path = fileUploadComponent.getUrlPrefix();
-        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid, path);
+        //查询用户的权限
+        //查询该用户是否有权限
+        List<String> stringList = sysMobileMenuRoleService.selectAppSidList(userSid);
+//        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionList(linkSid, path);
+        List<AppSubsetVersionVo> subsetVersionVoList = appSubsetVersionService.selectVersionListOne(linkSid, path,stringList);
         subsetVersionVoList.stream().forEach(item -> {
             /*if ("98ff0724-5df4-4fc7-ab6d-3996e7706acd".equals(item.getAppSid())) {
                 //供应链

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.java

@@ -56,4 +56,5 @@ public interface SysMobileMenuRoleMapper extends BaseMapper<SysMobileMenuRole> {
     List<AppIndexNewListVo> appRoleMenu(@Param("path") String path, @Param("roleSids") List<String> roleSids, @Param("titleGroup") String titleGroup, @Param("appSid") String appSid);
 
     List<String> selectMenuList(@Param("userSid") String userSid, @Param("appSid") String appSid);
+    List<String> selectAppSidList(@Param("userSid") String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleMapper.xml

@@ -71,4 +71,12 @@
         where sr.userSid = #{userSid}
           and smm.linkSid = #{appSid}
     </select>
+
+    <select id="selectAppSidList" resultType="java.lang.String">
+        select distinct smm.linkSid
+        from sys_mobile_menu smm
+        left join sys_mobile_menu_role smr on smm.sid = smr.menuSid
+        left join sys_user_role sr on sr.roleSid = smr.roleSid
+        where sr.userSid = #{userSid}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmobilemenurole/SysMobileMenuRoleService.java

@@ -150,4 +150,9 @@ public class SysMobileMenuRoleService extends MybatisBaseService<SysMobileMenuRo
         List<String> stringList = baseMapper.selectMenuList(userSid, appSid);
         return stringList;
     }
+
+    public List<String> selectAppSidList(String userSid) {
+        List<String> stringList = baseMapper.selectAppSidList(userSid);
+        return stringList;
+    }
 }