ver 4.33

app/api/sso.class.php

@@ -5,7 +5,9 @@
 * @copyright warlee 2014.(Shanghai)Co.,Ltd
 * @license http://kodcloud.com/tools/license/license.txt
 */
+if(!function_exists('get_client_ip')){
     require_once(dirname(dirname(__FILE__)).'/function/web.function.php');
+}
 class SSO{
 	static private function init(){
 		$sessionName = 'KOD_SESSION_SSO';

app/controller/systemMember.class.php

@@ -173,14 +173,24 @@ class systemMember extends Controller{
 		if(isset($groupInfo[$groupID])){
 			return $groupInfo[$groupID];
 		}
+
+		$role = false;
+		$plist = array();
 		foreach ($groupInfo as $key => $value) {//
 			$group = systemGroup::getInfo($key);//测试组，是否在用户所在组的子组
 			$arr = explode(',',$group['children']);
 			if (in_array($groupID,$arr)) {
-				return $groupInfo[$key];
+				//return $groupInfo[$key];	// 找到最近的父级部门,而非第一个
+				if(empty($plist)){
+					$plist = $arr;
+					$role = $groupInfo[$key];
+				}else if(in_array($group['groupID'], $plist)){
+					$plist = $arr;
+					$role = $groupInfo[$key];
 				}
 			}
-		return false;
+		}
+		return $role;
 	}
 
 	//删除 path id

static/style/skin/base/app_editor.css

@@ -1,5 +1,5 @@
-/* power by kodexplorer ver 4.33(2018-08-28) [build 1535448969.8954] */
+/* power by kodexplorer ver 4.33(2018-09-03) [build 1535948286.7959] */
 @import url('./fileIcon.css');
 @import url('./common.css');
 .frame-main{position:absolute;top:40px;width:100%;bottom:0px;}.frame-main .tools-left{background:#f8f8f8 url("../../../images/common/bg.gif") 0 0px;position:fixed;line-height:30px;padding-left:20px;height:28px;border-bottom:1px solid #ddd;left:0;width:100%;}.frame-main .tools-left a{font-size:1.25em;font-weight:800;text-decoration:none;color:#999;text-shadow:0 0 3px;display:inline-block;padding:2px 6px;margin-top:0;height:20px;line-height:20px;}.frame-main .tools-left a:hover{background:url("../../../images/common/buttons_40.png") 0 0px repeat-x;-webkit-box-shadow:0 2px 8px rgba(0,0,0,0.8);-moz-box-shadow:0 2px 8px rgba(0,0,0,0.8);box-shadow:0 2px 8px rgba(0,0,0,0.8);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.frame-main .frame-left{position:absolute;left:0;top:30px;bottom:0;width:200px;background:#fff;background-attachment:fixed;overflow:auto;}.frame-main .frame-left .ztree{margin-top:0;}.frame-main .frame-left .ztree li.level0{margin-bottom:5px;}.frame-main .frame-resize{width:10px;cursor:col-resize;z-index:100;position:absolute;left:195px;top:0;bottom:0;overflow:hidden;background:url("../../../images/common/resize.png") 0px 50% no-repeat;}.frame-main .frame-resize.active{background:#000;opacity:0.2;filter:alpha(opacity=20);}.frame-main .frame-right{left:200px;right:0;position:absolute;top:0;bottom:0;overflow:auto;}.frame-main .frame-right .frame-right-main .resize-mask{z-index:999;position:absolute;left:0;top:0;bottom:0;right:0;display:none;}.frame-main .frame-right .frame-right-main .frame{height:100%;border-left:1px solid #ddd;overflow:hidden;}
-/* ver 4.33(2018-08-28) [build 1535448969.8954] */
+/* ver 4.33(2018-09-03) [build 1535948286.7959] */