权限配置写入文件

protected/config/acl.conf.php

@@ -343,6 +343,8 @@ $acl ['EMAIL'] ['allow'] = array (
 				'showEmailContent',
 				'editEmail',
 				'app',
+				'out',
+				'login',
 		)
 );
 

protected/controller/HumanResourceController.php

@@ -1900,7 +1900,7 @@ class HumanResourceController extends DooController {
 		$staff = new staff ();
 		
 		$regularStaff = $staff->getStaffJobNumberByNature ( 1 );
-		$internStaff = $staff->getStaffJobNumberByNature ( 2 );
+		$internStaff = $staff->getStaffJobNumberByInformal (  );
 		
 		if (empty ( $regularStaff ['jobNumber'] ))
 			$regularStaffJobNumber = 'Z0001';

protected/controller/MainController.php

@@ -58,7 +58,9 @@ class MainController extends DooController {
 		// 主权限获得与判断
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
-		$detail = $staff->getStaffBySid ( $_COOKIE ["staff"] );
+		$detail=array();
+		if(isset($_COOKIE ["staff"]))
+			$detail = $staff->getStaffBySid ( $_COOKIE ["staff"] );
 		
 		$flag = false;
 		
@@ -266,7 +268,6 @@ class MainController extends DooController {
 	}
 	function out() {
 		setcookie ( "staff", "", time () - 3600, "/" );
-		
 		return "/";
 	}
 	function test() {

protected/model/staff.php

@@ -383,6 +383,20 @@ class staff extends DooModel {
 	}
 	
 	/**
+	 *
+	 * @param number $nature
+	 */
+	public function getStaffJobNumberByInformal(){
+		$detail=$this->getOne ( array (
+				'where' => "nature= '2' or nature ='3'",
+				'desc' => 'jobNumber',
+				'asArray' => TRUE
+		) );
+	
+		return $detail;
+	}
+	
+	/**
 	 * 根据用户ID获取相关信息
 	 * @param number $sid 用户ID
 	 */

protected/view/humanResource/hr.html

@@ -66,7 +66,7 @@
 									<tr><th class="taC" width="140">员工名称</th><th class="taC">办事处/部门</th><th class="taC">岗位</th><th class="taC">状态</th><th class="taC" width="120">时间</th></tr>
 									<!-- loop staffNew -->
 									<tr>
-									<td><a href="#detail" data-toggle="modal">{{staffList' value.username}}</a></td>
+									<td><a href="#employeeInfo" node-employeeInfo node-sidKey="{{staffList' value.sidKey}}" data-toggle="modal">{{staffList' value.username}}</a></td>
 									<td>{{staffList' value.category}}</td>
 									<td>{{staffList' value.position}}</td>
 									<td>

protected/view/menu.html

@@ -1,28 +1,50 @@
 
+<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine">
+<a href="/" class="icon- <!-- if {{memu}}=="index" --> selected <!-- endif --> ">B</a>
+</li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录">
+<a href="/contacts" class="icon- <!-- if {{memu}}=="contacts" --> selected <!-- endif -->">A</a>
+</li>
 
-<li><!-- if getGlobals('NEW2') != 0  || getGlobals('NEW') != 0 --> <!-- endif --> </li>
-<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="/" class="icon- <!-- if {{memu}}=="index" --> selected <!-- endif --> ">B</a></li>
-<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="/contacts" class="icon- <!-- if {{memu}}=="contacts" --> selected <!-- endif -->">A</a></li>
 <li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库">
-<a href="/keyonline" class="icon- <!-- if {{memu}}=="keyonline" --> selected <!-- endif -->">C</a></li>
+<a href="/keyonline" class="icon- <!-- if {{memu}}=="keyonline" --> selected <!-- endif -->">C</a>
+</li>
+
+
+
+<li  data-placement="right" data-toggle="ctooltip" class="topLine <!-- if   getGlobals('NEW') != 0 || getGlobals('NEW2') != 0  --> news <!-- endif -->" data-original-title="费用管理"  >
+<a href="/saeaBorad" class="icon- <!-- if {{memu}}=="receipt" --> selected <!-- endif -->" >U</a>
+</li>  
 
-<li class="hide"><a href="#">E</a></li>
-<li class="hide"><a href="#">D</a></li> 
- 
-<li  data-placement="right" data-toggle="ctooltip" class="topLine <!-- if   getGlobals('NEW') != 0 || getGlobals('NEW2') != 0  --> news <!-- endif -->" data-original-title="费用管理"  ><a href="/saeaBorad" class="icon- <!-- if {{memu}}=="receipt" --> selected <!-- endif -->" >U   </a></li>  
+<li data-placement="right" data-toggle="ctooltip" <!-- if isInvoiceNew() --> class="news" <!-- endif --> data-original-title="发票申请">
+<a href="/invoice" class="icon- <!-- if {{memu}}=="invoice" --> selected <!-- endif -->">D</a>
+</li>
 
-<li data-placement="right" data-toggle="ctooltip" <!-- if isInvoiceNew() --> class="news" <!-- endif --> data-original-title="发票申请"><a href="/invoice" class="icon- <!-- if {{memu}}=="invoice" --> selected <!-- endif -->">D</a></li>
 
-<li data-placement="right" data-toggle="ctooltip" data-original-title="人资管理"><a href="/hr" class="icon- <!-- if {{memu}}=="HumanResource" --> selected <!-- endif -->">m</a></li>
+<li data-placement="right" data-toggle="ctooltip" data-original-title="人资管理">
+<a href="/hr" class="icon- <!-- if {{memu}}=="HumanResource" --> selected <!-- endif -->">m</a>
+</li>
 
 <li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
 <a href="/eMailTask" class="icon- <!-- if {{memu}}=="eMailTask" --> selected <!-- endif -->">Z</a></li>
 
 <li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
-    <a href="/myList" class="icon- <!-- if {{memu}}=="holiday" --> selected <!-- endif -->">X</a></li>
+    <a href="/myList" class="icon- <!-- if {{memu}}=="holiday" --> selected <!-- endif -->">X</a>
+</li>
+    
+    
 <li data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="APP" >
-<a href="/app" class="icon- <!-- if {{memu}}=="app" --> selected <!-- endif -->">Y</a></li>
+<a href="/app" class="icon- <!-- if {{memu}}=="app" --> selected <!-- endif -->">Y</a>
+</li>
+
+
 <li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- <!-- if {{memu}}=="adminlock"||{{memu}}=="adminmyinfo"||{{memu}}=="adminoffice" --> selected <!-- endif -->" >F</a></li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" >
+<a href="/settingEmployeeInfo" class="icon- <!-- if {{memu}}=="adminlock"||{{memu}}=="adminmyinfo"||{{memu}}=="adminoffice" --> selected <!-- endif -->" >F</a>
+</li> 
+
 <li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>