权限项操作修复

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/MenuServiceImpl.java

@@ -104,6 +104,9 @@ public class MenuServiceImpl implements MenuService {
 
     @Override
     public List<TabSysMenu> selectByIds(List<Integer> menuIdList) {
+        if (CollectionUtils.isNotEmpty(menuIdList)) {
+            return new ArrayList<>();
+        }
         return tabSysMenuMapper.selectByIds(menuIdList);
     }
 

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -962,7 +962,7 @@ public class MenuApiServiceImpl implements MenuApiService {
         //已配置的操作项需要权限控制
         for (MenuDTO menuDTO : operationItemListOfAuthItem) {
             if (!operationItemMap.containsKey(menuDTO.getMenuId()) || StringUtils.isBlank(versionCode)
-                    || menuDTO.getMenuVersion().contains("_" + versionCode + "_")) {
+                    || !menuDTO.getMenuVersion().contains("_" + versionCode + "_")) {
                 //如果不存在，或者操作项的版本不对
                 //则是没有权限的操作项
                 resultList.add(menuDTO);

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.gic.auth.constant.LoginUserTypeEnum;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.LogManager;
@@ -64,7 +65,10 @@ public class LoginController {
             } else {
                 List<Integer> idList = new ArrayList<>();
                 for (UserDTO userDTO : result) {
-                    idList.add(userDTO.getEnterpriseId());
+                    //gic管理员，不查询运营实施
+                    if (userDTO.getLoginType().intValue() == LoginUserTypeEnum.GIC_USER.getCode()) {
+                        idList.add(userDTO.getEnterpriseId());
+                    }
                 }
                 ServiceResponse<List<EnterpriseDTO>> serviceResponse = this.enterpriseApiService
                         .listEnterpriseByIds(idList);