Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/io/office/config/ShiroConfig.java

src/main/java/io/office/config/ShiroConfig.java

@@ -61,8 +61,8 @@ public class ShiroConfig {
         filterMap.put("/captcha.jpg", "anon");
         filterMap.put("/aaa.txt", "anon");
         //不需要登录的接口
-        filterMap.put("/*/api/**", "anon");
         filterMap.put("/*/api/login", "anon");
+        filterMap.put("/*/api/**", "anon");
         filterMap.put("/**", "oauth2");
         shiroFilter.setFilterChainDefinitionMap(filterMap);
 

src/main/java/io/office/modules/manage/controller/TycpdmFirmController.java

@@ -147,15 +147,14 @@ public class TycpdmFirmController extends AbstractController {
      */
     @RequestMapping("/api/findTycpdmFirmLogoutFlagCount")
     // @RequiresPermissions("manage:tycpdmfirm:delete")
-    @Login
     public R findTycpdmFirmLogoutFlagCount(@RequestParam("userId") Integer userId){
         /*Integer id=getMemberUserId().intValue();
         if(id==null){
             return R.error("用户信息有误");
         }
         MemberEntity userMember = getMemberUser();*/
-        MemberEntity memberEntity = memberDao.selectById(userId);
-        Map<String,Integer> map=tycpdmFirmService.findTycpdmFirmLogoutFlagCount(memberEntity);
+        MemberEntity memberUser = getMemberUser();
+        Map<String,Integer> map=tycpdmFirmService.findTycpdmFirmLogoutFlagCount(memberUser);
         return R.ok().put("data",map);
     }
 

src/main/java/io/office/modules/manage/service/impl/BarcodeGenerationServiceImpl.java

 package io.office.modules.manage.service.impl;
 
-import com.sun.javaws.jnl.RContentDesc;
 import io.office.common.exception.RRException;
 import io.office.modules.manage.dao.QRcodeDao;
 import io.office.modules.manage.entity.GS1CodeListEntity;