修复用户的供应链模块没有权限时，外部图标提示数也不应该存在

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

@@ -9,6 +9,7 @@ import com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionService;
 import com.yxt.anrui.portal.biz.banner.BannerService;
 import com.yxt.anrui.portal.biz.flow.FlowableService;
 import com.yxt.anrui.portal.biz.formnotice.FormNoticeService;
+import com.yxt.anrui.portal.biz.sysmobilemenurole.SysMobileMenuRoleService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoFeign;
 import com.yxt.anrui.terminal.api.supplychain.baseInfo.AppScmBaseInfoQuery;
@@ -60,6 +61,8 @@ public class AppIndexRest implements AppIndexFeign {
     private AppScmBaseInfoFeign appScmBaseInfoFeign;
     @Autowired
     private AppIndexService appIndexService;
+    @Autowired
+    private SysMobileMenuRoleService sysMobileMenuRoleService;
 
     @Override
     public ResultBean<AppIndexVo> index(String userSid) {
@@ -164,24 +167,37 @@ public class AppIndexRest implements AppIndexFeign {
                     appScmBaseInfoQuery.setUserSid(userSid);
                     indexCountVo = appScmBaseInfoFeign.getToDoNum(appScmBaseInfoQuery);
                 }
+                //查询该用户是否有权限
+                List<String> stringList = sysMobileMenuRoleService.selectMenuList(userSid, item.getAppSid());
                 int count = 0;
                 if (indexCountVo.getSuccess()) {
                     AppScmBaseInfoVo appScmBaseInfoVo = indexCountVo.getData();
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectedCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getInspectedCarNum()).intValue();
+                    if (stringList.contains(AppIndexEnum.AppMenu.YC.getRemarks())) {
+                        if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectedCarNum())) {
+                            count = count + Integer.valueOf(appScmBaseInfoVo.getInspectedCarNum()).intValue();
+                        }
                     }
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectinoCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getInspectinoCarNum()).intValue();
+                    if (stringList.contains(AppIndexEnum.AppMenu.XJ.getRemarks())) {
+                        if (StringUtils.isNotBlank(appScmBaseInfoVo.getInspectinoCarNum())) {
+                            count = count + Integer.valueOf(appScmBaseInfoVo.getInspectinoCarNum()).intValue();
+                        }
                     }
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getMoveCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getMoveCarNum()).intValue();
+                    if (stringList.contains(AppIndexEnum.AppMenu.YK.getRemarks())) {
+                        if (StringUtils.isNotBlank(appScmBaseInfoVo.getMoveCarNum())) {
+                            count = count + Integer.valueOf(appScmBaseInfoVo.getMoveCarNum()).intValue();
+                        }
                     }
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getStorageCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getStorageCarNum()).intValue();
+                    if (stringList.contains(AppIndexEnum.AppMenu.SC.getRemarks())) {
+                        if (StringUtils.isNotBlank(appScmBaseInfoVo.getStorageCarNum())) {
+                            count = count + Integer.valueOf(appScmBaseInfoVo.getStorageCarNum()).intValue();
+                        }
                     }
-                    if (StringUtils.isNotBlank(appScmBaseInfoVo.getInventoryCarNum())) {
-                        count = count + Integer.valueOf(appScmBaseInfoVo.getInventoryCarNum()).intValue();
+                    if (stringList.contains(AppIndexEnum.AppMenu.PK.getRemarks())) {
+                        if (StringUtils.isNotBlank(appScmBaseInfoVo.getInventoryCarNum())) {
+                            count = count + Integer.valueOf(appScmBaseInfoVo.getInventoryCarNum()).intValue();
+                        }
                     }
+
                 }
                 item.setCornerNum(String.valueOf(count));
             } else {

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

@@ -48,10 +48,12 @@ public interface SysMobileMenuRoleMapper extends BaseMapper<SysMobileMenuRole> {
     /**
      * 移动端插件下的应用按应用类别分类
      *
-     * @param appSid   插件appSid
+     * @param appSid 插件appSid
      * @return
      */
-    List<AppIndexNewVo> getApp( @Param("appSid") String appSid);
+    List<AppIndexNewVo> getApp(@Param("appSid") String appSid);
 
     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);
 }

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

@@ -62,4 +62,13 @@
         and smm.titleGroup = #{titleGroup}
         order by smm.sortNo asc
     </select>
+
+    <select id="selectMenuList" resultType="java.lang.String">
+        select distinct smm.title
+        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}
+          and smm.linkSid = #{appSid}
+    </select>
 </mapper>

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

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