merge

code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -156,10 +156,10 @@ public class ApiController extends BaseController {
 	 * @return
 	 */
 	public boolean isLogin(HttpServletRequest request) {
-//		HttpSession httpSession = request.getSession();
-//		if (null == httpSession.getAttribute(TOKEN)) {
-//			return false;
-//		}
+		HttpSession httpSession = request.getSession();
+		if (null == httpSession.getAttribute(TOKEN)) {
+			return false;
+		}
 		return true;
 	}
 

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapOrgMapper.xml

@@ -2,36 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="SapOrgMapper">
 	<insert id="saveOne">
-		insert into sap_org(id,parentId,sapCode,sapName,level) 
+		insert into sap_org(id,parentId,sapCode,sapName,level)
 		values (#{id},#{parentId},#{sapCode},#{sapName},#{level})
 	</insert>
-	
+
 	<update id="updateSapName">
 		update sap_org set sapName=#{sapName} where id=#{id}
 	</update>
-	
+
 	<select id="selectOne" resultType="SapOrg">
 		select * from sap_org where parentId=#{parentId} and sapCode=#{sapCode} and level=#{level}
 	</select>
-	
+
 	<select id="selectListByParentId" resultType="SapOrg">
-		select * from sap_org 
+		select * from sap_org
 		where 1=1
 		<if test="parentId != null and parentId != ''">
-			and parentId=#{parentId} 
+			and parentId=#{parentId}
 		</if>
 	</select>
-	
+
 	<select id="selectListByName" resultType="SapOrg">
-		select * from sap_org 
-		where sapName like CONCAT(CONCAT('%', #{pd.name}),'%')
+		select * from sap_org where sapName like CONCAT(CONCAT('%', #{pd.name}),'%') order by sapCode
 	</select>
-	
+
 	<select id="selectById" resultType="SapOrg">
 		select * from sap_org where id = #{id}
 	</select>
-	
+
 	<update id="updateWxDepartId">
 		update sap_org set wxDepartId=#{wxDepartId} where id=#{id}
 	</update>
-</mapper>
+</mapper>

code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

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