liupeng 5 년 전
부모
커밋
79badea5de

+ 1 - 3
code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -1,6 +1,5 @@
 package org.fouram.controller;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -17,7 +16,6 @@ import org.fouram.core.util.AppUtil;
 import org.fouram.core.util.AppUtil.ResultConstant;
 import org.fouram.core.util.ConfConfig;
 import org.fouram.core.util.LoggerUtil;
-import org.fouram.core.util.StringUtil;
 import org.fouram.entity.SapOrg;
 import org.fouram.service.SapOrgService;
 import org.fouram.service.SapUserService;
@@ -158,7 +156,7 @@ public class ApiController extends BaseController {
 	 * @return
 	 */
 	public boolean isLogin(HttpServletRequest request) {
-		HttpSession httpSession = request.getSession();
+//		HttpSession httpSession = request.getSession();
 //		if (null == httpSession.getAttribute(TOKEN)) {
 //			return false;
 //		}

+ 6 - 2
code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -198,10 +198,14 @@ public class SapUserService extends BaseService {
 
 	@SuppressWarnings("unchecked")
 	public List<SapUser> selectListByDepartIdAndLevel(String departId) throws Exception {
-		SapOrg sapOrg = sapOrgService.selectById(departId);
+		String level = null;
+		if (!WebConstants.TOP_DEPART.toString().equals(departId)) {
+			SapOrg sapOrg = sapOrgService.selectById(departId);
+			level = sapOrg.getLevel();
+		}
 		PageData pd = new PageData();
 		pd.put("departId", departId);
-		pd.put("level", sapOrg.getLevel());
+		pd.put("level", level);
 		return (List<SapUser>) findList("SapUserMapper.selectListByDepartIdAndLevel", pd);
 	}