diff --git a/build/classes/db/companyauth_sql.xml b/build/classes/db/companyauth_sql.xml
index 358a8b4..9af607e 100644
--- a/build/classes/db/companyauth_sql.xml
+++ b/build/classes/db/companyauth_sql.xml
@@ -146,6 +146,45 @@ WHERE
 	 a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' )
 
 ]]></i>
-		
+
+
+
+
+
+		<i id="getcompanybyshuiju"><![CDATA[
+
+	  select distinct city_name id,city_name text,'0' pid from  tel_dic_city
+		]]></i>
+
+
+		<i id="getbureauList"><![CDATA[
+		 select a.CNAME, a.cguid,wm_concat(org_name) as ORG_NAME
+  from (SELECT
+  y.CNAME,
+  org_name,
+  y.CGUID
+FROM
+  SHUIJU_QUYU_USER t
+  LEFT JOIN aos_rms_user y ON t.user_id = y.CGUID
+) a      where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID 	]]></i>
+
+
+
+		<i id="getallListshuiju"><![CDATA[
+	 select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT user_id AS id FROM SHUIJU_QUYU_USER ) w,
+	AOS_RMS_USER z
+
+WHERE
+	z.CGUID = w.id  )  t
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+
+
+		]]></i>
+
 	</sql>
 </sqls>
\ No newline at end of file
diff --git a/build/classes/db/org_sql.xml b/build/classes/db/org_sql.xml
index eea67ef..465cf1f 100644
--- a/build/classes/db/org_sql.xml
+++ b/build/classes/db/org_sql.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>
		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
diff --git a/build/classes/db/orgname_sql.xml b/build/classes/db/orgname_sql.xml
new file mode 100644
index 0000000..e35a926
--- /dev/null
+++ b/build/classes/db/orgname_sql.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
+<sqls>
+	<sql group="orgname">
+		<i id="getList"><![CDATA[
+     	
+ select a.CNAME, a.cguid,wm_concat(ORG_SHORT_NAME) as ORG_NAME
+  from (SELECT
+	y.CNAME,
+	z.ORG_SHORT_NAME,
+  y.CGUID	
+FROM
+	RUSH_CRMCOMP_TO_USER_ORGNAME t
+	LEFT JOIN aos_rms_user y ON t.RUSH_USERID = y.CGUID
+	LEFT JOIN COMPANY_ORGANIZE z ON z.ORG_ID = t.CRMCOMPANYID 
+) a   where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID
+		]]></i>
+		
+		
+		<i id="getcompany"><![CDATA[
+		select t.ORG_ID as id,t.ORG_SHORT_NAME as text, t.PARENT_ORG_ID as pid from COMPANY_ORGANIZE t
+		
+	
+		]]></i>
+		
+		
+		<i id="getallList"><![CDATA[
+	select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT RUSH_USERID AS id FROM RUSH_CRMCOMP_TO_USER_ORGNAME ) w,
+	AOS_RMS_USER z
+	
+WHERE
+	z.CGUID = w.id  )  t 
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+		
+	
+		]]></i>
+		
+		
+		<i id="getqueryuserList"><![CDATA[
+	select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT USER_ID AS id FROM RUSH_USER_QUERYAUTH ) w,
+	AOS_RMS_USER z
+	
+WHERE
+	z.CGUID = w.id  )  t 
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid  and
+		$like(t.CNAME,CNAME)
+		
+		
+	
+		]]></i>
+		
+				<i id="getrushfeeuserList"><![CDATA[
+				SELECT
+	a.cname,
+	c.cname bname,
+	a.CGUID
+FROM
+	aos_rms_user a
+	LEFT JOIN AOS_RMS_USER_ORGN_REL b ON a.CGUID = b.CUSERID
+	LEFT JOIN AOS_ORGN c ON c.CGUID = b.CORGNID 
+WHERE
+	a.ISTATUS = '1' 
+	AND a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' ) 
+	
+	
+		]]></i>
+
+		<!--wm_concat ( cname ) AS auth,-->
+<i id="getauthList"><![CDATA[
+SELECT
+	t.bname || '    (' || t.dname || ')' bname,
+	t.dname,
+	t.cguid,
+
+	rtrim(xmlagg(xmlparse(content cname||',' wellformed)).getclobval(), ',') AS auth,
+	count( 1 ) num,
+	sum( CASE WHEN t.id = '1' THEN 1 ELSE 0 END ) AS aisino,
+	sum( CASE WHEN t.id = '932547335889271493' THEN 1 ELSE 0 END ) AS waihu 
+FROM
+	(
+SELECT
+	b.cname bname,
+	d.cguid bid,
+	d.cname dname,
+	b.cguid,
+	c.cname,
+	c.cguid idid,
+	g.cname bumen,
+	g.cguid id 
+FROM
+	RUSH_USER_QUERYAUTH a
+	 LEFT JOIN AOS_RMS_USER b ON a.USER_ID = b.cguid
+	 LEFT JOIN AOS_RMS_USER c ON a.userauth_id = c.cguid
+	 LEFT JOIN AOS_RMS_USER_ORGN_REL e ON b.CGUID = e.CUSERID
+	  LEFT JOIN AOS_ORGN d ON d.CGUID = e.CORGNID
+	  left join AOS_RMS_USER_ORGN_REL f ON c.CGUID = f.CUSERID
+	  LEFT JOIN AOS_ORGN g ON g.CGUID = f.CORGNID
+	) t where $like(t.bname,cname)
+GROUP BY
+	t.bname,
+	t.cguid,
+	t.dname
+	
+	
+		]]></i>
+		
+		
+		<i id="getauthbyid"><![CDATA[
+	SELECT
+	t.user_id,
+	t.USERAUTH_ID,
+	y.cname bname ,
+	z.cname 
+FROM
+	RUSH_USER_QUERYAUTH t
+	LEFT JOIN AOS_RMS_USER_ORGN_REL x ON t.USERAUTH_ID = x.CUSERID
+	LEFT JOIN AOS_ORGN y ON CORGNID = y.cguid
+	LEFT JOIN aos_rms_user z ON z.cguid = t.userauth_id 
+WHERE
+	t.user_id = {cguid}
+	
+		]]></i>
+		
+				<i id="getuserTreeData"><![CDATA[
+	SELECT
+	a.cname,
+	c.cname bname,
+	a.CGUID  id ,
+	c.CPARENTID,
+	c.cguid  ,
+	c.cname ||'---'||a.cname  text
+	
+FROM
+	aos_rms_user a
+	LEFT JOIN AOS_RMS_USER_ORGN_REL b ON a.CGUID = b.CUSERID
+	LEFT JOIN AOS_ORGN c ON c.CGUID = b.CORGNID 
+WHERE
+	 a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' )
+
+]]></i>
+
+
+
+
+
+		<i id="getcompanybyshuiju"><![CDATA[
+
+	  select distinct city_name id,city_name text,'0' pid from  tel_dic_city
+		]]></i>
+
+
+		<i id="getbureauList"><![CDATA[
+		 select a.CNAME, a.cguid,wm_concat(org_name) as ORG_NAME
+  from (SELECT
+  y.CNAME,
+  org_name,
+  y.CGUID
+FROM
+  SHUIJU_QUYU_USER t
+  LEFT JOIN aos_rms_user y ON t.user_id = y.CGUID
+) a      where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID 	]]></i>
+
+
+		<i id="getOrgListByUser"><![CDATA[
+
+
+
+
+		select CRMCOMPANYID text  from   RUSH_CRMCOMP_TO_USER_ORGNAME
+WHERE rush_userid  ={userId}
+
+
+
+
+		]]></i>
+
+
+		<i id="getallListshuiju"><![CDATA[
+	 select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT user_id AS id FROM SHUIJU_QUYU_USER ) w,
+	AOS_RMS_USER z
+
+WHERE
+	z.CGUID = w.id  )  t
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+
+
+		]]></i>
+
+	</sql>
+</sqls>
\ No newline at end of file
diff --git a/build/classes/html/bureau/companyadd.html b/build/classes/html/bureau/companyadd.html
new file mode 100644
index 0000000..e89c596
--- /dev/null
+++ b/build/classes/html/bureau/companyadd.html
@@ -0,0 +1,80 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" emptyText="请输入未分配权限的职员" required="true"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 40%;" url="rush/bureau/getallList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="25" header="姓名">></div>
+				<div field="name"  header="所属组织"></div>
+			</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" parentField="pid" url="rush/bureau/getcompanybyshuiju"
+			         transformtotreeformat="true"  showCheckBox="true"
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('tree');
+		grid.load();
+			function init(param){
+					aos.post({
+						url:"company/auth/",
+						data:param,
+						success:function(rtnData){
+							aos.getForm().setData(rtnData);
+						}
+					});
+				}
+			function save(){
+				var cguid = aos.get('grid');
+				var data = cguid.getSelected();
+				if(!data){
+					aos.alert('请选择职员。');
+					return;
+				}
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid'] = data.cguid;
+		        if(param['id']!=""){
+		        
+		        		 aos.post({
+		 					url:"rush/bureau/addCompany",
+		 					data:param,
+		 					success:function(rtnData){
+
+		 						aos.tip('保存成功');
+
+		 			        	
+		 					}
+		 		       
+		 				});
+		        		 
+		        	}
+		        	
+		       
+		      
+		        else{
+		        	aos.tip('请选择权限');
+		        }
+			}
+			function search(){
+				var grid = aos.get('grid');
+				grid.load();
+				var params={cname:aos.get('cname').value};
+				grid.load(params);
+				
+			}
+			
+			
+	
+	</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/bureau/companyauth.html b/build/classes/html/bureau/companyauth.html
new file mode 100644
index 0000000..3bd1804
--- /dev/null
+++ b/build/classes/html/bureau/companyauth.html
@@ -0,0 +1,86 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
+			<a widget="button" iconCls="icon-edit" onclick="edit()">权限授权</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/bureau/getbureauList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cguid"    visible="false"></div>
+				<div field="org_name" width="70"  header="拥有权限"></div>
+			</div>
+			
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('grid');
+		grid.load();
+		function search(){
+			var params={CNAME:aos.get('cname').value};
+			grid.load(params);
+		}
+		
+		function edit(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			var param = {};
+			param['pageState'] = 'editold';
+			param['cguid'] = data.cguid; 
+			param['cname'] = data.cname;
+			
+			aos.showWindow('canvas/bureau/companyedit', param, '400px', '600px', '功能授权',function(rtnValue){
+				grid.reload();
+			});
+		}
+	
+		
+		function remove(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			aos.post({
+				url:"rush/bureau/deleteAuth",
+				data:{cguid:data.cguid},
+				success:function(){
+					aos.tip('删除成功。');
+					grid.reload();
+				}
+					
+			});
+		}
+		
+		function add(){
+			var param = {};
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/bureau/companyadd', param, '500px', '600px', '权限授权添加', function(rtnValue){
+				grid.reload();
+			});
+		}
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/bureau/companyedit.html b/build/classes/html/bureau/companyedit.html
new file mode 100644
index 0000000..1748b43
--- /dev/null
+++ b/build/classes/html/bureau/companyedit.html
@@ -0,0 +1,60 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" allowInput="false"/>
+			<input widget="hidden"  name="cguid" />
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" url="rush/bureau/getcompanybyshuiju"
+			         transformtotreeformat="true"  showCheckBox="true"  
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	   
+		var grid = aos.get('tree');
+		   grid.load(); /*checkedField="id" */
+			function init(param){
+				var cname=param['cname'];
+				var cguid=param['cguid'];
+				aos.get('cname').setValue(cname);
+				aos.get('cguid').setValue(cguid);
+					aos.post({
+						url:"rush/bureau/getinfobyid",
+						data:param,
+						success:function(rtnData){
+							
+							grid.setValue(rtnData.id);
+						}
+					});
+				} 
+			
+		
+			function save(){
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid']=aos.get('cguid').value;
+				  if(param['id']!=""){
+		        aos.post({
+					url:"rush/bureau/addCompany",
+					data:param,
+					success:function(rtnData){
+					     aos.tip('修改成功');
+					}
+				});
+				  }
+				  else{
+					  aos.tip('请分配权限'); 
+				  }
+				  }
+			
+			
+	</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/bureau/recording.html b/build/classes/html/bureau/recording.html
index 448b2ea..7c94e51 100644
--- a/build/classes/html/bureau/recording.html
+++ b/build/classes/html/bureau/recording.html
@@ -5,12 +5,18 @@
 </head>
 <body>
 <div widget="toolbar" style="padding:5px;border:0;">
-			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="录音时间">
+			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="来电时间">
 			<input name="end_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss"  format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f" style="margin-left: -70px;"  label="至">
-	<input widget="edit"  name="phone"  label="来电人号码"/>
+	<input widget="edit"  name="phone"  label="来电号码"/>
 	<input widget="edit"  name="empno"  label="工号"/>
+	<input widget="combox"  name="company"  label="税局"  url="rush/bureau/getOrgListByUser"
+		   emptyText="请选择"  textField="text" valueField="id"  allowInput="false"
+		   showNullItem="true"   />
 	<input name="calltype" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
 		   data="[{id:'0',text:'呼入'},{id:'1',text:'呼出'}]" emptyText="请选择" label="呼叫类型">
+
+	<input name="manyidu" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
+		   data="[{id:'1',text:'非常满意'},{id:'2',text:'满意'},{id:'3',text:'不满意'},{id:'4',text:'暂未评价'}]" emptyText="请选择" label="满意度">
 	         <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 	         <a widget="button" iconCls="icon-export"   onclick="exportExl()">导出</a>
 		</div>
@@ -22,18 +28,19 @@
 				<div field="name" width="30" header="姓名" align="center"></div>
 				<div field="create_time" width="50" header="日期" align="center"></div>
 				<div field="phone_num" width="50" header="电话号码" align="center"></div>
-				<div field="start_time" width="70" header="开始时间" align="center"></div>
+				<div field="start_time" width="70" header="来电时间" align="center"></div>
 				<div field="end_time" width="70" header="结束时间" align="center"></div>
 				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>
 				<div field="call_type" width="35" renderer="callType" align="center"  header="呼叫类型" ></div>
 				<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>
 				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
-				<div field="caller_phone" width="50" header="来电人联系电话" align="center" ></div>
+				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
 				<div field="customer_name" width="50" header="公司名称" align="center" ></div>
 				<div field="question_content" width="50" header="咨询内容" align="center" ></div>
 				<div field="question_answer" width="50" header="解决办法" align="center" ></div>
 				<div field="productname" width="50" header="问题类型" align="center" ></div>
-				<div field="area_name" width="50" header="所属地区"  align="center" ></div>
+				<div field="area_name" width="40" header="所属地区"  align="center" ></div>
+				<div field="manyidu" width="45" renderer="manyi" align="center"  header="满意度" ></div>
 			</div>
 		</div>
 </body>
@@ -65,6 +72,8 @@
 				       searchenddate:enddate,
 					   phone:aos.get('phone').getValue(),
 				       empno:aos.get('empno').getValue(),
+				       manyi:aos.get('manyidu').getValue(),
+				       company:aos.get('company').getValue(),
 				       calltype:aos.get('calltype').getValue()
 
 			                                };
@@ -81,6 +90,8 @@
 			searchenddate:enddate,
 			phone:aos.get('phone').getValue(),
 			empno:aos.get('empno').getValue(),
+			manyi:aos.get('manyidu').getValue(),
+			company:aos.get('company').getValue(),
 			calltype:aos.get('calltype').getValue()};
 			grid.load(params);
 
@@ -93,7 +104,7 @@
 		   var row=e.row;
 			var value=row.play;
 		   if(value=='播放'){
-			   return "<a href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
+			   return "<a style=\"color:green;\"  href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
 		   }else{
 			   return value;
 		   }
@@ -116,6 +127,23 @@
 	   }
 
 
+	   function manyi(e){
+		   var row=e.row;
+		   var value=row.manyidu;
+		   if(value=='3'){
+			   return '<p style="color:red;">不满意</p>';
+		   }
+		   if(value=='1'){
+			   return '<p style="color:green;">非常满意</p>';
+		   }
+		   if(value=='2'){
+			   return '<p style="color:blue;">满意</p>';
+		   }
+		   else{
+			   return  '<p style="color:#8e4c3a;">暂未评价</p>';
+		   }
+	   }
+
 	   function downRender(e){
 		   var row=e.row;
 		   var value=row.down;
@@ -154,7 +182,7 @@
 
 	   function exportExl(){
 		   var base  = document.getElementsByTagName("base")[0].href;
-		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()));
+		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()))+"&manyi="+ encodeURI(encodeURI(aos.get('manyidu').getValue()))+"&company="+ encodeURI(encodeURI(aos.get('company').getValue()));
 
 	   }
 </script>
diff --git a/build/classes/html/bureau/shuijurecording.html b/build/classes/html/bureau/shuijurecording.html
new file mode 100644
index 0000000..d3a7d97
--- /dev/null
+++ b/build/classes/html/bureau/shuijurecording.html
@@ -0,0 +1,148 @@
+<html login="false" auth="false">
+<head>
+<meta charset="UTF-8">
+<title>录音操作</title>
+</head>
+<body>
+<div widget="toolbar" style="padding:5px;border:0;">
+			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="来电时间">
+			<input name="end_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss"  format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f" style="margin-left: -70px;"  label="至">
+	<input widget="edit"  name="phone"  label="来电号码"/>
+	<input widget="edit"  name="empno"  label="工号"/>
+	<input name="calltype" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
+		   data="[{id:'0',text:'呼入'},{id:'1',text:'呼出'}]" emptyText="请选择" label="呼叫类型">
+	         <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+<!--	         <a widget="button" iconCls="icon-export"   onclick="exportExl()">导出</a>-->
+		</div>
+<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/bureau/getlistBysj" >
+				<div type="indexcolumn" width="35" header="序号"></div>
+				<div field="id" visible="id"></div>
+				<div field="emp_no" width="30" header="工号" align="center"></div>
+<!--				<div field="name" width="30" header="姓名" align="center"></div>-->
+				<div field="create_time" width="50" header="日期" align="center"></div>
+				<div field="phone_num" width="50" header="电话号码" align="center"></div>
+				<div field="start_time" width="70" header="来电时间" align="center"></div>
+<!--				<div field="end_time" width="70" header="结束时间" align="center"></div>-->
+<!--				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>-->
+				<div field="call_type" width="35" renderer="callType" align="center"  header="呼叫类型" ></div>
+				<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>
+				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
+				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
+<!--				<div field="customer_name" width="50" header="公司名称" align="center" ></div>-->
+<!--				<div field="question_content" width="50" header="咨询内容" align="center" ></div>-->
+<!--				<div field="question_answer" width="50" header="解决办法" align="center" ></div>-->
+<!--				<div field="productname" width="50" header="问题类型" align="center" ></div>-->
+				<!--<div field="area_name" width="50" header="所属税局"  align="center" ></div>-->
+				<div field="org_name" width="50" header="所属地区"  align="center" ></div>
+			</div>
+		</div>
+</body>
+
+<script type="text/javascript">
+   
+	   var grid = aos.get('grid');
+	   var nowday=aos.formatDate(new Date(),"yyyy-MM-dd");
+
+
+   function search(){
+	   var grid = aos.get('grid');
+		var begindate=aos.get('start_time').getFormValue();
+		var enddate=aos.get('end_time').getFormValue();
+		if  (begindate!="")
+		{   
+			if (enddate=="")
+			{aos.alert('请选择结束时间！');
+			return ;
+			}
+			else{
+		    if (begindate>enddate)
+		    {
+		    	aos.alert('开始日期必须早于结束日期！');
+		    }else{
+
+			var params={
+				       searchbegindate:begindate,
+				       searchenddate:enddate,
+					   phone:aos.get('phone').getValue(),
+				       empno:aos.get('empno').getValue(),
+				       calltype:aos.get('calltype').getValue()
+
+			                                };
+				       grid.load(params);
+		          }
+			}
+		}else if(enddate!="")
+				{
+			aos.alert('请选择开始时间！');
+			return ;
+				}else{ 
+		var params={
+			searchbegindate:begindate,
+			searchenddate:enddate,
+			phone:aos.get('phone').getValue(),
+			empno:aos.get('empno').getValue(),
+			calltype:aos.get('calltype').getValue()};
+			grid.load(params);
+
+	             }
+	}
+
+
+
+	   function playRender(e){
+		   var row=e.row;
+		   var value=row.play;
+		   if(value=='播放'){
+			   return "<a style=\"color:green;\"  href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
+		   }else{
+			   return value;
+		   }
+	   }
+
+
+	   function callType(e){
+		   var row=e.row;
+		   var value=row.call_type;
+		   if(value=='0'){
+			   return '<p style="color:red;">呼入</p>';
+		   }
+		   if(value=='1'){
+			   return '<p style="color:green;">呼出</p>';
+
+		   }
+		   else{
+			   return value;
+		   }
+	   }
+
+
+	   function downRender(e){
+		   var row=e.row;
+		   var value=row.down;
+		   if(value=='下载'){
+			   return "<a href="+ row.path +">"+value+"</a>";
+		   }else{
+			   return value;
+		   }
+	   }
+	   function showMyDialog(video_path){
+		   var params ={};
+		   params["video_path"]=video_path;
+		   aos.showWindow('canvas/rush/record_rush_play',params,'800px', '400px', '录音播放', function(rtnValue){
+
+		   });
+	   }
+
+
+
+
+
+
+	   function exportExl(){
+		   var base  = document.getElementsByTagName("base")[0].href;
+		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()));
+
+	   }
+</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/orgname/companyadd.html b/build/classes/html/orgname/companyadd.html
new file mode 100644
index 0000000..222f614
--- /dev/null
+++ b/build/classes/html/orgname/companyadd.html
@@ -0,0 +1,80 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" emptyText="请输入未分配权限的职员" required="true"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 20%;" url="rush/orgname/getallList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="25" header="姓名">></div>
+				<div field="name"  header="所属组织"></div>
+			</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" parentField="pid" url="rush/orgname/getcompanyTreeData"
+			         transformtotreeformat="true"  showCheckBox="true"
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('tree');
+		grid.load();
+			function init(param){
+					aos.post({
+						url:"company/auth/",
+						data:param,
+						success:function(rtnData){
+							aos.getForm().setData(rtnData);
+						}
+					});
+				}
+			function save(){
+				var cguid = aos.get('grid');
+				var data = cguid.getSelected();
+				if(!data){
+					aos.alert('请选择职员。');
+					return;
+				}
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid'] = data.cguid;
+		        if(param['id']!=""){
+		        
+		        		 aos.post({
+		 					url:"rush/orgname/addCompany",
+		 					data:param,
+		 					success:function(rtnData){
+
+		 						aos.tip('保存成功');
+
+		 			        	
+		 					}
+		 		       
+		 				});
+		        		 
+		        	}
+		        	
+		       
+		      
+		        else{
+		        	aos.tip('请选择权限');
+		        }
+			}
+			function search(){
+				var grid = aos.get('grid');
+				grid.load();
+				var params={cname:aos.get('cname').value};
+				grid.load(params);
+				
+			}
+			
+			
+	
+	</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/orgname/companyauth.html b/build/classes/html/orgname/companyauth.html
new file mode 100644
index 0000000..64437b1
--- /dev/null
+++ b/build/classes/html/orgname/companyauth.html
@@ -0,0 +1,86 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
+			<a widget="button" iconCls="icon-edit" onclick="edit()">权限授权</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/orgname/getList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cguid"    visible="false"></div>
+				<div field="org_name" width="70"  header="拥有权限"></div>
+			</div>
+			
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('grid');
+		grid.load();
+		function search(){
+			var params={CNAME:aos.get('cname').value};
+			grid.load(params);
+		}
+		
+		function edit(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			var param = {};
+			param['pageState'] = 'editold';
+			param['cguid'] = data.cguid; 
+			param['cname'] = data.cname;
+			
+			aos.showWindow('canvas/orgname/companyedit', param, '400px', '600px', '功能授权',function(rtnValue){
+				grid.reload();
+			});
+		}
+	
+		
+		function remove(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			aos.post({
+				url:"rush/orgname/deleteAuth",
+				data:{cguid:data.cguid},
+				success:function(){
+					aos.tip('删除成功。');
+					grid.reload();
+				}
+					
+			});
+		}
+		
+		function add(){
+			var param = {};
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/orgname/companyadd', param, '500px', '900px', '权限授权添加', function(rtnValue){
+				grid.reload();
+			});
+		}
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/html/orgname/companyedit.html b/build/classes/html/orgname/companyedit.html
new file mode 100644
index 0000000..0c9b60f
--- /dev/null
+++ b/build/classes/html/orgname/companyedit.html
@@ -0,0 +1,60 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" allowInput="false"/>
+			<input widget="hidden"  name="cguid" />
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" url="company/auth/getcompanyTreeData"  
+			         transformtotreeformat="true"  showCheckBox="true"  
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	   
+		var grid = aos.get('tree');
+		   grid.load(); /*checkedField="id" */
+			function init(param){
+				var cname=param['cname'];
+				var cguid=param['cguid'];
+				aos.get('cname').setValue(cname);
+				aos.get('cguid').setValue(cguid);
+					aos.post({
+						url:"rush/orgname/getinfobyid",
+						data:param,
+						success:function(rtnData){
+							
+							grid.setValue(rtnData.id);
+						}
+					});
+				} 
+			
+		
+			function save(){
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid']=aos.get('cguid').value;
+				  if(param['id']!=""){
+		        aos.post({
+					url:"rush/orgname/addCompany",
+					data:param,
+					success:function(rtnData){
+					     aos.tip('修改成功');
+					}
+				});
+				  }
+				  else{
+					  aos.tip('请分配权限'); 
+				  }
+				  }
+			
+			
+	</script>
+</html>
\ No newline at end of file
diff --git a/build/classes/rush/BureauAction.class b/build/classes/rush/BureauAction.class
index 3684ad8..95796d0 100644
Binary files a/build/classes/rush/BureauAction.class and b/build/classes/rush/BureauAction.class differ
diff --git a/build/classes/rush/OrgAction.class b/build/classes/rush/OrgAction.class
index 5af88cd..1e15a05 100644
Binary files a/build/classes/rush/OrgAction.class and b/build/classes/rush/OrgAction.class differ
diff --git a/build/classes/rush/OrgNameAction.class b/build/classes/rush/OrgNameAction.class
new file mode 100644
index 0000000..7d83f57
Binary files /dev/null and b/build/classes/rush/OrgNameAction.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/companyauth_sql.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/companyauth_sql.xml
index 358a8b4..9af607e 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/companyauth_sql.xml
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/companyauth_sql.xml
@@ -146,6 +146,45 @@ WHERE
 	 a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' )
 
 ]]></i>
-		
+
+
+
+
+
+		<i id="getcompanybyshuiju"><![CDATA[
+
+	  select distinct city_name id,city_name text,'0' pid from  tel_dic_city
+		]]></i>
+
+
+		<i id="getbureauList"><![CDATA[
+		 select a.CNAME, a.cguid,wm_concat(org_name) as ORG_NAME
+  from (SELECT
+  y.CNAME,
+  org_name,
+  y.CGUID
+FROM
+  SHUIJU_QUYU_USER t
+  LEFT JOIN aos_rms_user y ON t.user_id = y.CGUID
+) a      where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID 	]]></i>
+
+
+
+		<i id="getallListshuiju"><![CDATA[
+	 select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT user_id AS id FROM SHUIJU_QUYU_USER ) w,
+	AOS_RMS_USER z
+
+WHERE
+	z.CGUID = w.id  )  t
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+
+
+		]]></i>
+
 	</sql>
 </sqls>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/org_sql.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/org_sql.xml
index eea67ef..465cf1f 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/org_sql.xml
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/org_sql.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>
		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/orgname_sql.xml b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/orgname_sql.xml
new file mode 100644
index 0000000..e35a926
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/db/orgname_sql.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
+<sqls>
+	<sql group="orgname">
+		<i id="getList"><![CDATA[
+     	
+ select a.CNAME, a.cguid,wm_concat(ORG_SHORT_NAME) as ORG_NAME
+  from (SELECT
+	y.CNAME,
+	z.ORG_SHORT_NAME,
+  y.CGUID	
+FROM
+	RUSH_CRMCOMP_TO_USER_ORGNAME t
+	LEFT JOIN aos_rms_user y ON t.RUSH_USERID = y.CGUID
+	LEFT JOIN COMPANY_ORGANIZE z ON z.ORG_ID = t.CRMCOMPANYID 
+) a   where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID
+		]]></i>
+		
+		
+		<i id="getcompany"><![CDATA[
+		select t.ORG_ID as id,t.ORG_SHORT_NAME as text, t.PARENT_ORG_ID as pid from COMPANY_ORGANIZE t
+		
+	
+		]]></i>
+		
+		
+		<i id="getallList"><![CDATA[
+	select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT RUSH_USERID AS id FROM RUSH_CRMCOMP_TO_USER_ORGNAME ) w,
+	AOS_RMS_USER z
+	
+WHERE
+	z.CGUID = w.id  )  t 
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+		
+	
+		]]></i>
+		
+		
+		<i id="getqueryuserList"><![CDATA[
+	select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT USER_ID AS id FROM RUSH_USER_QUERYAUTH ) w,
+	AOS_RMS_USER z
+	
+WHERE
+	z.CGUID = w.id  )  t 
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid  and
+		$like(t.CNAME,CNAME)
+		
+		
+	
+		]]></i>
+		
+				<i id="getrushfeeuserList"><![CDATA[
+				SELECT
+	a.cname,
+	c.cname bname,
+	a.CGUID
+FROM
+	aos_rms_user a
+	LEFT JOIN AOS_RMS_USER_ORGN_REL b ON a.CGUID = b.CUSERID
+	LEFT JOIN AOS_ORGN c ON c.CGUID = b.CORGNID 
+WHERE
+	a.ISTATUS = '1' 
+	AND a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' ) 
+	
+	
+		]]></i>
+
+		<!--wm_concat ( cname ) AS auth,-->
+<i id="getauthList"><![CDATA[
+SELECT
+	t.bname || '    (' || t.dname || ')' bname,
+	t.dname,
+	t.cguid,
+
+	rtrim(xmlagg(xmlparse(content cname||',' wellformed)).getclobval(), ',') AS auth,
+	count( 1 ) num,
+	sum( CASE WHEN t.id = '1' THEN 1 ELSE 0 END ) AS aisino,
+	sum( CASE WHEN t.id = '932547335889271493' THEN 1 ELSE 0 END ) AS waihu 
+FROM
+	(
+SELECT
+	b.cname bname,
+	d.cguid bid,
+	d.cname dname,
+	b.cguid,
+	c.cname,
+	c.cguid idid,
+	g.cname bumen,
+	g.cguid id 
+FROM
+	RUSH_USER_QUERYAUTH a
+	 LEFT JOIN AOS_RMS_USER b ON a.USER_ID = b.cguid
+	 LEFT JOIN AOS_RMS_USER c ON a.userauth_id = c.cguid
+	 LEFT JOIN AOS_RMS_USER_ORGN_REL e ON b.CGUID = e.CUSERID
+	  LEFT JOIN AOS_ORGN d ON d.CGUID = e.CORGNID
+	  left join AOS_RMS_USER_ORGN_REL f ON c.CGUID = f.CUSERID
+	  LEFT JOIN AOS_ORGN g ON g.CGUID = f.CORGNID
+	) t where $like(t.bname,cname)
+GROUP BY
+	t.bname,
+	t.cguid,
+	t.dname
+	
+	
+		]]></i>
+		
+		
+		<i id="getauthbyid"><![CDATA[
+	SELECT
+	t.user_id,
+	t.USERAUTH_ID,
+	y.cname bname ,
+	z.cname 
+FROM
+	RUSH_USER_QUERYAUTH t
+	LEFT JOIN AOS_RMS_USER_ORGN_REL x ON t.USERAUTH_ID = x.CUSERID
+	LEFT JOIN AOS_ORGN y ON CORGNID = y.cguid
+	LEFT JOIN aos_rms_user z ON z.cguid = t.userauth_id 
+WHERE
+	t.user_id = {cguid}
+	
+		]]></i>
+		
+				<i id="getuserTreeData"><![CDATA[
+	SELECT
+	a.cname,
+	c.cname bname,
+	a.CGUID  id ,
+	c.CPARENTID,
+	c.cguid  ,
+	c.cname ||'---'||a.cname  text
+	
+FROM
+	aos_rms_user a
+	LEFT JOIN AOS_RMS_USER_ORGN_REL b ON a.CGUID = b.CUSERID
+	LEFT JOIN AOS_ORGN c ON c.CGUID = b.CORGNID 
+WHERE
+	 a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' )
+
+]]></i>
+
+
+
+
+
+		<i id="getcompanybyshuiju"><![CDATA[
+
+	  select distinct city_name id,city_name text,'0' pid from  tel_dic_city
+		]]></i>
+
+
+		<i id="getbureauList"><![CDATA[
+		 select a.CNAME, a.cguid,wm_concat(org_name) as ORG_NAME
+  from (SELECT
+  y.CNAME,
+  org_name,
+  y.CGUID
+FROM
+  SHUIJU_QUYU_USER t
+  LEFT JOIN aos_rms_user y ON t.user_id = y.CGUID
+) a      where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID 	]]></i>
+
+
+		<i id="getOrgListByUser"><![CDATA[
+
+
+
+
+		select CRMCOMPANYID text  from   RUSH_CRMCOMP_TO_USER_ORGNAME
+WHERE rush_userid  ={userId}
+
+
+
+
+		]]></i>
+
+
+		<i id="getallListshuiju"><![CDATA[
+	 select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT user_id AS id FROM SHUIJU_QUYU_USER ) w,
+	AOS_RMS_USER z
+
+WHERE
+	z.CGUID = w.id  )  t
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+
+
+		]]></i>
+
+	</sql>
+</sqls>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyadd.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyadd.html
new file mode 100644
index 0000000..e89c596
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyadd.html
@@ -0,0 +1,80 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" emptyText="请输入未分配权限的职员" required="true"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 40%;" url="rush/bureau/getallList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="25" header="姓名">></div>
+				<div field="name"  header="所属组织"></div>
+			</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" parentField="pid" url="rush/bureau/getcompanybyshuiju"
+			         transformtotreeformat="true"  showCheckBox="true"
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('tree');
+		grid.load();
+			function init(param){
+					aos.post({
+						url:"company/auth/",
+						data:param,
+						success:function(rtnData){
+							aos.getForm().setData(rtnData);
+						}
+					});
+				}
+			function save(){
+				var cguid = aos.get('grid');
+				var data = cguid.getSelected();
+				if(!data){
+					aos.alert('请选择职员。');
+					return;
+				}
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid'] = data.cguid;
+		        if(param['id']!=""){
+		        
+		        		 aos.post({
+		 					url:"rush/bureau/addCompany",
+		 					data:param,
+		 					success:function(rtnData){
+
+		 						aos.tip('保存成功');
+
+		 			        	
+		 					}
+		 		       
+		 				});
+		        		 
+		        	}
+		        	
+		       
+		      
+		        else{
+		        	aos.tip('请选择权限');
+		        }
+			}
+			function search(){
+				var grid = aos.get('grid');
+				grid.load();
+				var params={cname:aos.get('cname').value};
+				grid.load(params);
+				
+			}
+			
+			
+	
+	</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyauth.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyauth.html
new file mode 100644
index 0000000..3bd1804
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyauth.html
@@ -0,0 +1,86 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
+			<a widget="button" iconCls="icon-edit" onclick="edit()">权限授权</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/bureau/getbureauList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cguid"    visible="false"></div>
+				<div field="org_name" width="70"  header="拥有权限"></div>
+			</div>
+			
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('grid');
+		grid.load();
+		function search(){
+			var params={CNAME:aos.get('cname').value};
+			grid.load(params);
+		}
+		
+		function edit(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			var param = {};
+			param['pageState'] = 'editold';
+			param['cguid'] = data.cguid; 
+			param['cname'] = data.cname;
+			
+			aos.showWindow('canvas/bureau/companyedit', param, '400px', '600px', '功能授权',function(rtnValue){
+				grid.reload();
+			});
+		}
+	
+		
+		function remove(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			aos.post({
+				url:"rush/bureau/deleteAuth",
+				data:{cguid:data.cguid},
+				success:function(){
+					aos.tip('删除成功。');
+					grid.reload();
+				}
+					
+			});
+		}
+		
+		function add(){
+			var param = {};
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/bureau/companyadd', param, '500px', '600px', '权限授权添加', function(rtnValue){
+				grid.reload();
+			});
+		}
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyedit.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyedit.html
new file mode 100644
index 0000000..1748b43
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/companyedit.html
@@ -0,0 +1,60 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" allowInput="false"/>
+			<input widget="hidden"  name="cguid" />
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" url="rush/bureau/getcompanybyshuiju"
+			         transformtotreeformat="true"  showCheckBox="true"  
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	   
+		var grid = aos.get('tree');
+		   grid.load(); /*checkedField="id" */
+			function init(param){
+				var cname=param['cname'];
+				var cguid=param['cguid'];
+				aos.get('cname').setValue(cname);
+				aos.get('cguid').setValue(cguid);
+					aos.post({
+						url:"rush/bureau/getinfobyid",
+						data:param,
+						success:function(rtnData){
+							
+							grid.setValue(rtnData.id);
+						}
+					});
+				} 
+			
+		
+			function save(){
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid']=aos.get('cguid').value;
+				  if(param['id']!=""){
+		        aos.post({
+					url:"rush/bureau/addCompany",
+					data:param,
+					success:function(rtnData){
+					     aos.tip('修改成功');
+					}
+				});
+				  }
+				  else{
+					  aos.tip('请分配权限'); 
+				  }
+				  }
+			
+			
+	</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
index 448b2ea..7c94e51 100644
--- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html
@@ -5,12 +5,18 @@
 </head>
 <body>
 <div widget="toolbar" style="padding:5px;border:0;">
-			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="录音时间">
+			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="来电时间">
 			<input name="end_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss"  format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f" style="margin-left: -70px;"  label="至">
-	<input widget="edit"  name="phone"  label="来电人号码"/>
+	<input widget="edit"  name="phone"  label="来电号码"/>
 	<input widget="edit"  name="empno"  label="工号"/>
+	<input widget="combox"  name="company"  label="税局"  url="rush/bureau/getOrgListByUser"
+		   emptyText="请选择"  textField="text" valueField="id"  allowInput="false"
+		   showNullItem="true"   />
 	<input name="calltype" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
 		   data="[{id:'0',text:'呼入'},{id:'1',text:'呼出'}]" emptyText="请选择" label="呼叫类型">
+
+	<input name="manyidu" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
+		   data="[{id:'1',text:'非常满意'},{id:'2',text:'满意'},{id:'3',text:'不满意'},{id:'4',text:'暂未评价'}]" emptyText="请选择" label="满意度">
 	         <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 	         <a widget="button" iconCls="icon-export"   onclick="exportExl()">导出</a>
 		</div>
@@ -22,18 +28,19 @@
 				<div field="name" width="30" header="姓名" align="center"></div>
 				<div field="create_time" width="50" header="日期" align="center"></div>
 				<div field="phone_num" width="50" header="电话号码" align="center"></div>
-				<div field="start_time" width="70" header="开始时间" align="center"></div>
+				<div field="start_time" width="70" header="来电时间" align="center"></div>
 				<div field="end_time" width="70" header="结束时间" align="center"></div>
 				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>
 				<div field="call_type" width="35" renderer="callType" align="center"  header="呼叫类型" ></div>
 				<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>
 				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
-				<div field="caller_phone" width="50" header="来电人联系电话" align="center" ></div>
+				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
 				<div field="customer_name" width="50" header="公司名称" align="center" ></div>
 				<div field="question_content" width="50" header="咨询内容" align="center" ></div>
 				<div field="question_answer" width="50" header="解决办法" align="center" ></div>
 				<div field="productname" width="50" header="问题类型" align="center" ></div>
-				<div field="area_name" width="50" header="所属地区"  align="center" ></div>
+				<div field="area_name" width="40" header="所属地区"  align="center" ></div>
+				<div field="manyidu" width="45" renderer="manyi" align="center"  header="满意度" ></div>
 			</div>
 		</div>
 </body>
@@ -65,6 +72,8 @@
 				       searchenddate:enddate,
 					   phone:aos.get('phone').getValue(),
 				       empno:aos.get('empno').getValue(),
+				       manyi:aos.get('manyidu').getValue(),
+				       company:aos.get('company').getValue(),
 				       calltype:aos.get('calltype').getValue()
 
 			                                };
@@ -81,6 +90,8 @@
 			searchenddate:enddate,
 			phone:aos.get('phone').getValue(),
 			empno:aos.get('empno').getValue(),
+			manyi:aos.get('manyidu').getValue(),
+			company:aos.get('company').getValue(),
 			calltype:aos.get('calltype').getValue()};
 			grid.load(params);
 
@@ -93,7 +104,7 @@
 		   var row=e.row;
 			var value=row.play;
 		   if(value=='播放'){
-			   return "<a href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
+			   return "<a style=\"color:green;\"  href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
 		   }else{
 			   return value;
 		   }
@@ -116,6 +127,23 @@
 	   }
 
 
+	   function manyi(e){
+		   var row=e.row;
+		   var value=row.manyidu;
+		   if(value=='3'){
+			   return '<p style="color:red;">不满意</p>';
+		   }
+		   if(value=='1'){
+			   return '<p style="color:green;">非常满意</p>';
+		   }
+		   if(value=='2'){
+			   return '<p style="color:blue;">满意</p>';
+		   }
+		   else{
+			   return  '<p style="color:#8e4c3a;">暂未评价</p>';
+		   }
+	   }
+
 	   function downRender(e){
 		   var row=e.row;
 		   var value=row.down;
@@ -154,7 +182,7 @@
 
 	   function exportExl(){
 		   var base  = document.getElementsByTagName("base")[0].href;
-		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()));
+		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()))+"&manyi="+ encodeURI(encodeURI(aos.get('manyidu').getValue()))+"&company="+ encodeURI(encodeURI(aos.get('company').getValue()));
 
 	   }
 </script>
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/shuijurecording.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/shuijurecording.html
new file mode 100644
index 0000000..d3a7d97
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/shuijurecording.html
@@ -0,0 +1,148 @@
+<html login="false" auth="false">
+<head>
+<meta charset="UTF-8">
+<title>录音操作</title>
+</head>
+<body>
+<div widget="toolbar" style="padding:5px;border:0;">
+			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="来电时间">
+			<input name="end_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss"  format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f" style="margin-left: -70px;"  label="至">
+	<input widget="edit"  name="phone"  label="来电号码"/>
+	<input widget="edit"  name="empno"  label="工号"/>
+	<input name="calltype" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
+		   data="[{id:'0',text:'呼入'},{id:'1',text:'呼出'}]" emptyText="请选择" label="呼叫类型">
+	         <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+<!--	         <a widget="button" iconCls="icon-export"   onclick="exportExl()">导出</a>-->
+		</div>
+<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/bureau/getlistBysj" >
+				<div type="indexcolumn" width="35" header="序号"></div>
+				<div field="id" visible="id"></div>
+				<div field="emp_no" width="30" header="工号" align="center"></div>
+<!--				<div field="name" width="30" header="姓名" align="center"></div>-->
+				<div field="create_time" width="50" header="日期" align="center"></div>
+				<div field="phone_num" width="50" header="电话号码" align="center"></div>
+				<div field="start_time" width="70" header="来电时间" align="center"></div>
+<!--				<div field="end_time" width="70" header="结束时间" align="center"></div>-->
+<!--				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>-->
+				<div field="call_type" width="35" renderer="callType" align="center"  header="呼叫类型" ></div>
+				<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>
+				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
+				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
+<!--				<div field="customer_name" width="50" header="公司名称" align="center" ></div>-->
+<!--				<div field="question_content" width="50" header="咨询内容" align="center" ></div>-->
+<!--				<div field="question_answer" width="50" header="解决办法" align="center" ></div>-->
+<!--				<div field="productname" width="50" header="问题类型" align="center" ></div>-->
+				<!--<div field="area_name" width="50" header="所属税局"  align="center" ></div>-->
+				<div field="org_name" width="50" header="所属地区"  align="center" ></div>
+			</div>
+		</div>
+</body>
+
+<script type="text/javascript">
+   
+	   var grid = aos.get('grid');
+	   var nowday=aos.formatDate(new Date(),"yyyy-MM-dd");
+
+
+   function search(){
+	   var grid = aos.get('grid');
+		var begindate=aos.get('start_time').getFormValue();
+		var enddate=aos.get('end_time').getFormValue();
+		if  (begindate!="")
+		{   
+			if (enddate=="")
+			{aos.alert('请选择结束时间！');
+			return ;
+			}
+			else{
+		    if (begindate>enddate)
+		    {
+		    	aos.alert('开始日期必须早于结束日期！');
+		    }else{
+
+			var params={
+				       searchbegindate:begindate,
+				       searchenddate:enddate,
+					   phone:aos.get('phone').getValue(),
+				       empno:aos.get('empno').getValue(),
+				       calltype:aos.get('calltype').getValue()
+
+			                                };
+				       grid.load(params);
+		          }
+			}
+		}else if(enddate!="")
+				{
+			aos.alert('请选择开始时间！');
+			return ;
+				}else{ 
+		var params={
+			searchbegindate:begindate,
+			searchenddate:enddate,
+			phone:aos.get('phone').getValue(),
+			empno:aos.get('empno').getValue(),
+			calltype:aos.get('calltype').getValue()};
+			grid.load(params);
+
+	             }
+	}
+
+
+
+	   function playRender(e){
+		   var row=e.row;
+		   var value=row.play;
+		   if(value=='播放'){
+			   return "<a style=\"color:green;\"  href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
+		   }else{
+			   return value;
+		   }
+	   }
+
+
+	   function callType(e){
+		   var row=e.row;
+		   var value=row.call_type;
+		   if(value=='0'){
+			   return '<p style="color:red;">呼入</p>';
+		   }
+		   if(value=='1'){
+			   return '<p style="color:green;">呼出</p>';
+
+		   }
+		   else{
+			   return value;
+		   }
+	   }
+
+
+	   function downRender(e){
+		   var row=e.row;
+		   var value=row.down;
+		   if(value=='下载'){
+			   return "<a href="+ row.path +">"+value+"</a>";
+		   }else{
+			   return value;
+		   }
+	   }
+	   function showMyDialog(video_path){
+		   var params ={};
+		   params["video_path"]=video_path;
+		   aos.showWindow('canvas/rush/record_rush_play',params,'800px', '400px', '录音播放', function(rtnValue){
+
+		   });
+	   }
+
+
+
+
+
+
+	   function exportExl(){
+		   var base  = document.getElementsByTagName("base")[0].href;
+		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()));
+
+	   }
+</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyadd.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyadd.html
new file mode 100644
index 0000000..222f614
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyadd.html
@@ -0,0 +1,80 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" emptyText="请输入未分配权限的职员" required="true"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 20%;" url="rush/orgname/getallList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="25" header="姓名">></div>
+				<div field="name"  header="所属组织"></div>
+			</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" parentField="pid" url="rush/orgname/getcompanyTreeData"
+			         transformtotreeformat="true"  showCheckBox="true"
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('tree');
+		grid.load();
+			function init(param){
+					aos.post({
+						url:"company/auth/",
+						data:param,
+						success:function(rtnData){
+							aos.getForm().setData(rtnData);
+						}
+					});
+				}
+			function save(){
+				var cguid = aos.get('grid');
+				var data = cguid.getSelected();
+				if(!data){
+					aos.alert('请选择职员。');
+					return;
+				}
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid'] = data.cguid;
+		        if(param['id']!=""){
+		        
+		        		 aos.post({
+		 					url:"rush/orgname/addCompany",
+		 					data:param,
+		 					success:function(rtnData){
+
+		 						aos.tip('保存成功');
+
+		 			        	
+		 					}
+		 		       
+		 				});
+		        		 
+		        	}
+		        	
+		       
+		      
+		        else{
+		        	aos.tip('请选择权限');
+		        }
+			}
+			function search(){
+				var grid = aos.get('grid');
+				grid.load();
+				var params={cname:aos.get('cname').value};
+				grid.load(params);
+				
+			}
+			
+			
+	
+	</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyauth.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyauth.html
new file mode 100644
index 0000000..64437b1
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyauth.html
@@ -0,0 +1,86 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
+			<a widget="button" iconCls="icon-edit" onclick="edit()">权限授权</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/orgname/getList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cguid"    visible="false"></div>
+				<div field="org_name" width="70"  header="拥有权限"></div>
+			</div>
+			
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('grid');
+		grid.load();
+		function search(){
+			var params={CNAME:aos.get('cname').value};
+			grid.load(params);
+		}
+		
+		function edit(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			var param = {};
+			param['pageState'] = 'editold';
+			param['cguid'] = data.cguid; 
+			param['cname'] = data.cname;
+			
+			aos.showWindow('canvas/orgname/companyedit', param, '400px', '600px', '功能授权',function(rtnValue){
+				grid.reload();
+			});
+		}
+	
+		
+		function remove(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			aos.post({
+				url:"rush/orgname/deleteAuth",
+				data:{cguid:data.cguid},
+				success:function(){
+					aos.tip('删除成功。');
+					grid.reload();
+				}
+					
+			});
+		}
+		
+		function add(){
+			var param = {};
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/orgname/companyadd', param, '500px', '900px', '权限授权添加', function(rtnValue){
+				grid.reload();
+			});
+		}
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyedit.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyedit.html
new file mode 100644
index 0000000..0c9b60f
--- /dev/null
+++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/orgname/companyedit.html
@@ -0,0 +1,60 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" allowInput="false"/>
+			<input widget="hidden"  name="cguid" />
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" url="company/auth/getcompanyTreeData"  
+			         transformtotreeformat="true"  showCheckBox="true"  
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	   
+		var grid = aos.get('tree');
+		   grid.load(); /*checkedField="id" */
+			function init(param){
+				var cname=param['cname'];
+				var cguid=param['cguid'];
+				aos.get('cname').setValue(cname);
+				aos.get('cguid').setValue(cguid);
+					aos.post({
+						url:"rush/orgname/getinfobyid",
+						data:param,
+						success:function(rtnData){
+							
+							grid.setValue(rtnData.id);
+						}
+					});
+				} 
+			
+		
+			function save(){
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid']=aos.get('cguid').value;
+				  if(param['id']!=""){
+		        aos.post({
+					url:"rush/orgname/addCompany",
+					data:param,
+					success:function(rtnData){
+					     aos.tip('修改成功');
+					}
+				});
+				  }
+				  else{
+					  aos.tip('请分配权限'); 
+				  }
+				  }
+			
+			
+	</script>
+</html>
\ No newline at end of file
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/BureauAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/BureauAction.class
index 3684ad8..95796d0 100644
Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/BureauAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/BureauAction.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/OrgAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/OrgAction.class
index 5af88cd..1e15a05 100644
Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/OrgAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/OrgAction.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/OrgNameAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/OrgNameAction.class
new file mode 100644
index 0000000..7d83f57
Binary files /dev/null and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/OrgNameAction.class differ
diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
index 4381b3c..02a70e8 100644
--- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini
+++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini
@@ -1,3 +1,3 @@
 #save ini
-#Fri Aug 04 11:27:47 CST 2023
+#Thu Aug 31 20:01:58 CST 2023
 deploystamp=1612237236000
diff --git a/resource/db/companyauth_sql.xml b/resource/db/companyauth_sql.xml
index 358a8b4..9af607e 100644
--- a/resource/db/companyauth_sql.xml
+++ b/resource/db/companyauth_sql.xml
@@ -146,6 +146,45 @@ WHERE
 	 a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' )
 
 ]]></i>
-		
+
+
+
+
+
+		<i id="getcompanybyshuiju"><![CDATA[
+
+	  select distinct city_name id,city_name text,'0' pid from  tel_dic_city
+		]]></i>
+
+
+		<i id="getbureauList"><![CDATA[
+		 select a.CNAME, a.cguid,wm_concat(org_name) as ORG_NAME
+  from (SELECT
+  y.CNAME,
+  org_name,
+  y.CGUID
+FROM
+  SHUIJU_QUYU_USER t
+  LEFT JOIN aos_rms_user y ON t.user_id = y.CGUID
+) a      where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID 	]]></i>
+
+
+
+		<i id="getallListshuiju"><![CDATA[
+	 select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT user_id AS id FROM SHUIJU_QUYU_USER ) w,
+	AOS_RMS_USER z
+
+WHERE
+	z.CGUID = w.id  )  t
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+
+
+		]]></i>
+
 	</sql>
 </sqls>
\ No newline at end of file
diff --git a/resource/db/org_sql.xml b/resource/db/org_sql.xml
index eea67ef..465cf1f 100644
--- a/resource/db/org_sql.xml
+++ b/resource/db/org_sql.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>
		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
<sqls>
	<sql group="rushfee_org">
		<i id="getOrgList"><![CDATA[
		     select 
		     	org_id id,
		     	org_short_name text,
		     	parent_org_id pid
		     from 
		     	COMPANY_ORGANIZE
		     where org_id !=3701 order by org_id
		]]></i>

		<i id="getOrgListByUser"><![CDATA[

    select distinct city_name id,city_name text,'0' pid from  tel_dic_city

WHERE city_name in(select org_name from  SHUIJU_QUYU_USER where  user_id ={userId})

		]]></i>



		<i id="getRecordList"><![CDATA[
		     select 
		     	*
		     from 
		     	RUSH_RECORD
		]]></i>
		<i id="getRevenueByOrgId"><![CDATA[
		     select 
		     	revenueid id,
		     	revenuename text
		     from 
		     	REVENUE_INFO_FORMAL
		     where companyid ={companyid}
		]]></i>
		
	</sql>
</sqls>
\ No newline at end of file
diff --git a/resource/db/orgname_sql.xml b/resource/db/orgname_sql.xml
new file mode 100644
index 0000000..e35a926
--- /dev/null
+++ b/resource/db/orgname_sql.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqls SYSTEM "sql_definition.dtd">
+<sqls>
+	<sql group="orgname">
+		<i id="getList"><![CDATA[
+     	
+ select a.CNAME, a.cguid,wm_concat(ORG_SHORT_NAME) as ORG_NAME
+  from (SELECT
+	y.CNAME,
+	z.ORG_SHORT_NAME,
+  y.CGUID	
+FROM
+	RUSH_CRMCOMP_TO_USER_ORGNAME t
+	LEFT JOIN aos_rms_user y ON t.RUSH_USERID = y.CGUID
+	LEFT JOIN COMPANY_ORGANIZE z ON z.ORG_ID = t.CRMCOMPANYID 
+) a   where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID
+		]]></i>
+		
+		
+		<i id="getcompany"><![CDATA[
+		select t.ORG_ID as id,t.ORG_SHORT_NAME as text, t.PARENT_ORG_ID as pid from COMPANY_ORGANIZE t
+		
+	
+		]]></i>
+		
+		
+		<i id="getallList"><![CDATA[
+	select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT RUSH_USERID AS id FROM RUSH_CRMCOMP_TO_USER_ORGNAME ) w,
+	AOS_RMS_USER z
+	
+WHERE
+	z.CGUID = w.id  )  t 
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+		
+	
+		]]></i>
+		
+		
+		<i id="getqueryuserList"><![CDATA[
+	select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT USER_ID AS id FROM RUSH_USER_QUERYAUTH ) w,
+	AOS_RMS_USER z
+	
+WHERE
+	z.CGUID = w.id  )  t 
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid  and
+		$like(t.CNAME,CNAME)
+		
+		
+	
+		]]></i>
+		
+				<i id="getrushfeeuserList"><![CDATA[
+				SELECT
+	a.cname,
+	c.cname bname,
+	a.CGUID
+FROM
+	aos_rms_user a
+	LEFT JOIN AOS_RMS_USER_ORGN_REL b ON a.CGUID = b.CUSERID
+	LEFT JOIN AOS_ORGN c ON c.CGUID = b.CORGNID 
+WHERE
+	a.ISTATUS = '1' 
+	AND a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' ) 
+	
+	
+		]]></i>
+
+		<!--wm_concat ( cname ) AS auth,-->
+<i id="getauthList"><![CDATA[
+SELECT
+	t.bname || '    (' || t.dname || ')' bname,
+	t.dname,
+	t.cguid,
+
+	rtrim(xmlagg(xmlparse(content cname||',' wellformed)).getclobval(), ',') AS auth,
+	count( 1 ) num,
+	sum( CASE WHEN t.id = '1' THEN 1 ELSE 0 END ) AS aisino,
+	sum( CASE WHEN t.id = '932547335889271493' THEN 1 ELSE 0 END ) AS waihu 
+FROM
+	(
+SELECT
+	b.cname bname,
+	d.cguid bid,
+	d.cname dname,
+	b.cguid,
+	c.cname,
+	c.cguid idid,
+	g.cname bumen,
+	g.cguid id 
+FROM
+	RUSH_USER_QUERYAUTH a
+	 LEFT JOIN AOS_RMS_USER b ON a.USER_ID = b.cguid
+	 LEFT JOIN AOS_RMS_USER c ON a.userauth_id = c.cguid
+	 LEFT JOIN AOS_RMS_USER_ORGN_REL e ON b.CGUID = e.CUSERID
+	  LEFT JOIN AOS_ORGN d ON d.CGUID = e.CORGNID
+	  left join AOS_RMS_USER_ORGN_REL f ON c.CGUID = f.CUSERID
+	  LEFT JOIN AOS_ORGN g ON g.CGUID = f.CORGNID
+	) t where $like(t.bname,cname)
+GROUP BY
+	t.bname,
+	t.cguid,
+	t.dname
+	
+	
+		]]></i>
+		
+		
+		<i id="getauthbyid"><![CDATA[
+	SELECT
+	t.user_id,
+	t.USERAUTH_ID,
+	y.cname bname ,
+	z.cname 
+FROM
+	RUSH_USER_QUERYAUTH t
+	LEFT JOIN AOS_RMS_USER_ORGN_REL x ON t.USERAUTH_ID = x.CUSERID
+	LEFT JOIN AOS_ORGN y ON CORGNID = y.cguid
+	LEFT JOIN aos_rms_user z ON z.cguid = t.userauth_id 
+WHERE
+	t.user_id = {cguid}
+	
+		]]></i>
+		
+				<i id="getuserTreeData"><![CDATA[
+	SELECT
+	a.cname,
+	c.cname bname,
+	a.CGUID  id ,
+	c.CPARENTID,
+	c.cguid  ,
+	c.cname ||'---'||a.cname  text
+	
+FROM
+	aos_rms_user a
+	LEFT JOIN AOS_RMS_USER_ORGN_REL b ON a.CGUID = b.CUSERID
+	LEFT JOIN AOS_ORGN c ON c.CGUID = b.CORGNID 
+WHERE
+	 a.CUSERTYPE IN ( SELECT cguid FROM RUSH_AUTH d LEFT JOIN AOS_RMS_USERTYPE_CFG e ON d.NAME = e.CNAME WHERE d.TYPE = 'rush_sharer_type' )
+
+]]></i>
+
+
+
+
+
+		<i id="getcompanybyshuiju"><![CDATA[
+
+	  select distinct city_name id,city_name text,'0' pid from  tel_dic_city
+		]]></i>
+
+
+		<i id="getbureauList"><![CDATA[
+		 select a.CNAME, a.cguid,wm_concat(org_name) as ORG_NAME
+  from (SELECT
+  y.CNAME,
+  org_name,
+  y.CGUID
+FROM
+  SHUIJU_QUYU_USER t
+  LEFT JOIN aos_rms_user y ON t.user_id = y.CGUID
+) a      where	 $like(CNAME,CNAME)
+ group by  a.CNAME,a.CGUID 	]]></i>
+
+
+		<i id="getOrgListByUser"><![CDATA[
+
+
+
+
+		select CRMCOMPANYID text  from   RUSH_CRMCOMP_TO_USER_ORGNAME
+WHERE rush_userid  ={userId}
+
+
+
+
+		]]></i>
+
+
+		<i id="getallListshuiju"><![CDATA[
+	 select t.cguid ,x.CORGNID,y.cname as name,t.cname  from (SELECT cguid,cname FROM
+	( SELECT CGUID AS id FROM AOS_RMS_USER MINUS SELECT user_id AS id FROM SHUIJU_QUYU_USER ) w,
+	AOS_RMS_USER z
+
+WHERE
+	z.CGUID = w.id  )  t
+	left join   AOS_RMS_USER_ORGN_REL x on t.cguid=x.CUSERID
+	left join    AOS_ORGN y on  CORGNID=y.cguid
+	where t.cguid=x.CUSERID and x.CORGNID=y.cguid and
+		$like(t.CNAME,CNAME)
+
+
+		]]></i>
+
+	</sql>
+</sqls>
\ No newline at end of file
diff --git a/resource/html/bureau/companyadd.html b/resource/html/bureau/companyadd.html
new file mode 100644
index 0000000..e89c596
--- /dev/null
+++ b/resource/html/bureau/companyadd.html
@@ -0,0 +1,80 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" emptyText="请输入未分配权限的职员" required="true"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 40%;" url="rush/bureau/getallList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="25" header="姓名">></div>
+				<div field="name"  header="所属组织"></div>
+			</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" parentField="pid" url="rush/bureau/getcompanybyshuiju"
+			         transformtotreeformat="true"  showCheckBox="true"
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('tree');
+		grid.load();
+			function init(param){
+					aos.post({
+						url:"company/auth/",
+						data:param,
+						success:function(rtnData){
+							aos.getForm().setData(rtnData);
+						}
+					});
+				}
+			function save(){
+				var cguid = aos.get('grid');
+				var data = cguid.getSelected();
+				if(!data){
+					aos.alert('请选择职员。');
+					return;
+				}
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid'] = data.cguid;
+		        if(param['id']!=""){
+		        
+		        		 aos.post({
+		 					url:"rush/bureau/addCompany",
+		 					data:param,
+		 					success:function(rtnData){
+
+		 						aos.tip('保存成功');
+
+		 			        	
+		 					}
+		 		       
+		 				});
+		        		 
+		        	}
+		        	
+		       
+		      
+		        else{
+		        	aos.tip('请选择权限');
+		        }
+			}
+			function search(){
+				var grid = aos.get('grid');
+				grid.load();
+				var params={cname:aos.get('cname').value};
+				grid.load(params);
+				
+			}
+			
+			
+	
+	</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/bureau/companyauth.html b/resource/html/bureau/companyauth.html
new file mode 100644
index 0000000..3bd1804
--- /dev/null
+++ b/resource/html/bureau/companyauth.html
@@ -0,0 +1,86 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
+			<a widget="button" iconCls="icon-edit" onclick="edit()">权限授权</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/bureau/getbureauList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cguid"    visible="false"></div>
+				<div field="org_name" width="70"  header="拥有权限"></div>
+			</div>
+			
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('grid');
+		grid.load();
+		function search(){
+			var params={CNAME:aos.get('cname').value};
+			grid.load(params);
+		}
+		
+		function edit(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			var param = {};
+			param['pageState'] = 'editold';
+			param['cguid'] = data.cguid; 
+			param['cname'] = data.cname;
+			
+			aos.showWindow('canvas/bureau/companyedit', param, '400px', '600px', '功能授权',function(rtnValue){
+				grid.reload();
+			});
+		}
+	
+		
+		function remove(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			aos.post({
+				url:"rush/bureau/deleteAuth",
+				data:{cguid:data.cguid},
+				success:function(){
+					aos.tip('删除成功。');
+					grid.reload();
+				}
+					
+			});
+		}
+		
+		function add(){
+			var param = {};
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/bureau/companyadd', param, '500px', '600px', '权限授权添加', function(rtnValue){
+				grid.reload();
+			});
+		}
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/bureau/companyedit.html b/resource/html/bureau/companyedit.html
new file mode 100644
index 0000000..1748b43
--- /dev/null
+++ b/resource/html/bureau/companyedit.html
@@ -0,0 +1,60 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" allowInput="false"/>
+			<input widget="hidden"  name="cguid" />
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" url="rush/bureau/getcompanybyshuiju"
+			         transformtotreeformat="true"  showCheckBox="true"  
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	   
+		var grid = aos.get('tree');
+		   grid.load(); /*checkedField="id" */
+			function init(param){
+				var cname=param['cname'];
+				var cguid=param['cguid'];
+				aos.get('cname').setValue(cname);
+				aos.get('cguid').setValue(cguid);
+					aos.post({
+						url:"rush/bureau/getinfobyid",
+						data:param,
+						success:function(rtnData){
+							
+							grid.setValue(rtnData.id);
+						}
+					});
+				} 
+			
+		
+			function save(){
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid']=aos.get('cguid').value;
+				  if(param['id']!=""){
+		        aos.post({
+					url:"rush/bureau/addCompany",
+					data:param,
+					success:function(rtnData){
+					     aos.tip('修改成功');
+					}
+				});
+				  }
+				  else{
+					  aos.tip('请分配权限'); 
+				  }
+				  }
+			
+			
+	</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/bureau/recording.html b/resource/html/bureau/recording.html
index 448b2ea..7c94e51 100644
--- a/resource/html/bureau/recording.html
+++ b/resource/html/bureau/recording.html
@@ -5,12 +5,18 @@
 </head>
 <body>
 <div widget="toolbar" style="padding:5px;border:0;">
-			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="录音时间">
+			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="来电时间">
 			<input name="end_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss"  format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f" style="margin-left: -70px;"  label="至">
-	<input widget="edit"  name="phone"  label="来电人号码"/>
+	<input widget="edit"  name="phone"  label="来电号码"/>
 	<input widget="edit"  name="empno"  label="工号"/>
+	<input widget="combox"  name="company"  label="税局"  url="rush/bureau/getOrgListByUser"
+		   emptyText="请选择"  textField="text" valueField="id"  allowInput="false"
+		   showNullItem="true"   />
 	<input name="calltype" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
 		   data="[{id:'0',text:'呼入'},{id:'1',text:'呼出'}]" emptyText="请选择" label="呼叫类型">
+
+	<input name="manyidu" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
+		   data="[{id:'1',text:'非常满意'},{id:'2',text:'满意'},{id:'3',text:'不满意'},{id:'4',text:'暂未评价'}]" emptyText="请选择" label="满意度">
 	         <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
 	         <a widget="button" iconCls="icon-export"   onclick="exportExl()">导出</a>
 		</div>
@@ -22,18 +28,19 @@
 				<div field="name" width="30" header="姓名" align="center"></div>
 				<div field="create_time" width="50" header="日期" align="center"></div>
 				<div field="phone_num" width="50" header="电话号码" align="center"></div>
-				<div field="start_time" width="70" header="开始时间" align="center"></div>
+				<div field="start_time" width="70" header="来电时间" align="center"></div>
 				<div field="end_time" width="70" header="结束时间" align="center"></div>
 				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>
 				<div field="call_type" width="35" renderer="callType" align="center"  header="呼叫类型" ></div>
 				<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>
 				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
-				<div field="caller_phone" width="50" header="来电人联系电话" align="center" ></div>
+				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
 				<div field="customer_name" width="50" header="公司名称" align="center" ></div>
 				<div field="question_content" width="50" header="咨询内容" align="center" ></div>
 				<div field="question_answer" width="50" header="解决办法" align="center" ></div>
 				<div field="productname" width="50" header="问题类型" align="center" ></div>
-				<div field="area_name" width="50" header="所属地区"  align="center" ></div>
+				<div field="area_name" width="40" header="所属地区"  align="center" ></div>
+				<div field="manyidu" width="45" renderer="manyi" align="center"  header="满意度" ></div>
 			</div>
 		</div>
 </body>
@@ -65,6 +72,8 @@
 				       searchenddate:enddate,
 					   phone:aos.get('phone').getValue(),
 				       empno:aos.get('empno').getValue(),
+				       manyi:aos.get('manyidu').getValue(),
+				       company:aos.get('company').getValue(),
 				       calltype:aos.get('calltype').getValue()
 
 			                                };
@@ -81,6 +90,8 @@
 			searchenddate:enddate,
 			phone:aos.get('phone').getValue(),
 			empno:aos.get('empno').getValue(),
+			manyi:aos.get('manyidu').getValue(),
+			company:aos.get('company').getValue(),
 			calltype:aos.get('calltype').getValue()};
 			grid.load(params);
 
@@ -93,7 +104,7 @@
 		   var row=e.row;
 			var value=row.play;
 		   if(value=='播放'){
-			   return "<a href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
+			   return "<a style=\"color:green;\"  href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
 		   }else{
 			   return value;
 		   }
@@ -116,6 +127,23 @@
 	   }
 
 
+	   function manyi(e){
+		   var row=e.row;
+		   var value=row.manyidu;
+		   if(value=='3'){
+			   return '<p style="color:red;">不满意</p>';
+		   }
+		   if(value=='1'){
+			   return '<p style="color:green;">非常满意</p>';
+		   }
+		   if(value=='2'){
+			   return '<p style="color:blue;">满意</p>';
+		   }
+		   else{
+			   return  '<p style="color:#8e4c3a;">暂未评价</p>';
+		   }
+	   }
+
 	   function downRender(e){
 		   var row=e.row;
 		   var value=row.down;
@@ -154,7 +182,7 @@
 
 	   function exportExl(){
 		   var base  = document.getElementsByTagName("base")[0].href;
-		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()));
+		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()))+"&manyi="+ encodeURI(encodeURI(aos.get('manyidu').getValue()))+"&company="+ encodeURI(encodeURI(aos.get('company').getValue()));
 
 	   }
 </script>
diff --git a/resource/html/bureau/shuijurecording.html b/resource/html/bureau/shuijurecording.html
new file mode 100644
index 0000000..d3a7d97
--- /dev/null
+++ b/resource/html/bureau/shuijurecording.html
@@ -0,0 +1,148 @@
+<html login="false" auth="false">
+<head>
+<meta charset="UTF-8">
+<title>录音操作</title>
+</head>
+<body>
+<div widget="toolbar" style="padding:5px;border:0;">
+			<input name="start_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss" format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f"   label="来电时间">
+			<input name="end_time" widget=datechooser showTime="true" timeFormat="HH:mm:ss"  format="yyyy-MM-dd" valueFormat="yyyy-MM-dd"  allowinput="f" style="margin-left: -70px;"  label="至">
+	<input widget="edit"  name="phone"  label="来电号码"/>
+	<input widget="edit"  name="empno"  label="工号"/>
+	<input name="calltype" widget=combox  allowinput="f" style="width: 200px;" showNullItem="true"
+		   data="[{id:'0',text:'呼入'},{id:'1',text:'呼出'}]" emptyText="请选择" label="呼叫类型">
+	         <a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+<!--	         <a widget="button" iconCls="icon-export"   onclick="exportExl()">导出</a>-->
+		</div>
+<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/bureau/getlistBysj" >
+				<div type="indexcolumn" width="35" header="序号"></div>
+				<div field="id" visible="id"></div>
+				<div field="emp_no" width="30" header="工号" align="center"></div>
+<!--				<div field="name" width="30" header="姓名" align="center"></div>-->
+				<div field="create_time" width="50" header="日期" align="center"></div>
+				<div field="phone_num" width="50" header="电话号码" align="center"></div>
+				<div field="start_time" width="70" header="来电时间" align="center"></div>
+<!--				<div field="end_time" width="70" header="结束时间" align="center"></div>-->
+<!--				<div field="record_duration" width="40" header="录音时长(秒)"  align="center"></div>-->
+				<div field="call_type" width="35" renderer="callType" align="center"  header="呼叫类型" ></div>
+				<div field="down"  width="40" header="下载" renderer="downRender" align="center"></div>
+				<div field="play"  width="40" header="调听" renderer="playRender" align="center"></div>
+				<div field="caller_phone" width="50" header="来电号码" align="center" ></div>
+<!--				<div field="customer_name" width="50" header="公司名称" align="center" ></div>-->
+<!--				<div field="question_content" width="50" header="咨询内容" align="center" ></div>-->
+<!--				<div field="question_answer" width="50" header="解决办法" align="center" ></div>-->
+<!--				<div field="productname" width="50" header="问题类型" align="center" ></div>-->
+				<!--<div field="area_name" width="50" header="所属税局"  align="center" ></div>-->
+				<div field="org_name" width="50" header="所属地区"  align="center" ></div>
+			</div>
+		</div>
+</body>
+
+<script type="text/javascript">
+   
+	   var grid = aos.get('grid');
+	   var nowday=aos.formatDate(new Date(),"yyyy-MM-dd");
+
+
+   function search(){
+	   var grid = aos.get('grid');
+		var begindate=aos.get('start_time').getFormValue();
+		var enddate=aos.get('end_time').getFormValue();
+		if  (begindate!="")
+		{   
+			if (enddate=="")
+			{aos.alert('请选择结束时间！');
+			return ;
+			}
+			else{
+		    if (begindate>enddate)
+		    {
+		    	aos.alert('开始日期必须早于结束日期！');
+		    }else{
+
+			var params={
+				       searchbegindate:begindate,
+				       searchenddate:enddate,
+					   phone:aos.get('phone').getValue(),
+				       empno:aos.get('empno').getValue(),
+				       calltype:aos.get('calltype').getValue()
+
+			                                };
+				       grid.load(params);
+		          }
+			}
+		}else if(enddate!="")
+				{
+			aos.alert('请选择开始时间！');
+			return ;
+				}else{ 
+		var params={
+			searchbegindate:begindate,
+			searchenddate:enddate,
+			phone:aos.get('phone').getValue(),
+			empno:aos.get('empno').getValue(),
+			calltype:aos.get('calltype').getValue()};
+			grid.load(params);
+
+	             }
+	}
+
+
+
+	   function playRender(e){
+		   var row=e.row;
+		   var value=row.play;
+		   if(value=='播放'){
+			   return "<a style=\"color:green;\"  href='javascript:void(0)' onclick='showMyDialog(\""+ row.path +"\")'>"+value+"</a>";
+		   }else{
+			   return value;
+		   }
+	   }
+
+
+	   function callType(e){
+		   var row=e.row;
+		   var value=row.call_type;
+		   if(value=='0'){
+			   return '<p style="color:red;">呼入</p>';
+		   }
+		   if(value=='1'){
+			   return '<p style="color:green;">呼出</p>';
+
+		   }
+		   else{
+			   return value;
+		   }
+	   }
+
+
+	   function downRender(e){
+		   var row=e.row;
+		   var value=row.down;
+		   if(value=='下载'){
+			   return "<a href="+ row.path +">"+value+"</a>";
+		   }else{
+			   return value;
+		   }
+	   }
+	   function showMyDialog(video_path){
+		   var params ={};
+		   params["video_path"]=video_path;
+		   aos.showWindow('canvas/rush/record_rush_play',params,'800px', '400px', '录音播放', function(rtnValue){
+
+		   });
+	   }
+
+
+
+
+
+
+	   function exportExl(){
+		   var base  = document.getElementsByTagName("base")[0].href;
+		   window.location.href=base+"rush/bureau/exportRecoding?empno="+aos.get('empno').getValue()+"&searchbegindate="+aos.get('start_time').getFormValue()+"&searchenddate="+aos.get('end_time').getFormValue()+"&phone="+aos.get('phone').getValue()+"&calltype="+ encodeURI(encodeURI(aos.get('calltype').getValue()));
+
+	   }
+</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/orgname/companyadd.html b/resource/html/orgname/companyadd.html
new file mode 100644
index 0000000..222f614
--- /dev/null
+++ b/resource/html/orgname/companyadd.html
@@ -0,0 +1,80 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" emptyText="请输入未分配权限的职员" required="true"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 20%;" url="rush/orgname/getallList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="25" header="姓名">></div>
+				<div field="name"  header="所属组织"></div>
+			</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" parentField="pid" url="rush/orgname/getcompanyTreeData"
+			         transformtotreeformat="true"  showCheckBox="true"
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('tree');
+		grid.load();
+			function init(param){
+					aos.post({
+						url:"company/auth/",
+						data:param,
+						success:function(rtnData){
+							aos.getForm().setData(rtnData);
+						}
+					});
+				}
+			function save(){
+				var cguid = aos.get('grid');
+				var data = cguid.getSelected();
+				if(!data){
+					aos.alert('请选择职员。');
+					return;
+				}
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid'] = data.cguid;
+		        if(param['id']!=""){
+		        
+		        		 aos.post({
+		 					url:"rush/orgname/addCompany",
+		 					data:param,
+		 					success:function(rtnData){
+
+		 						aos.tip('保存成功');
+
+		 			        	
+		 					}
+		 		       
+		 				});
+		        		 
+		        	}
+		        	
+		       
+		      
+		        else{
+		        	aos.tip('请选择权限');
+		        }
+			}
+			function search(){
+				var grid = aos.get('grid');
+				grid.load();
+				var params={cname:aos.get('cname').value};
+				grid.load(params);
+				
+			}
+			
+			
+	
+	</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/orgname/companyauth.html b/resource/html/orgname/companyauth.html
new file mode 100644
index 0000000..64437b1
--- /dev/null
+++ b/resource/html/orgname/companyauth.html
@@ -0,0 +1,86 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员"/>
+			<a widget="button" iconCls="icon-search" onclick="search()">查询</a>
+			<a widget="button" iconCls="icon-add" onclick="add()">新增</a>
+			<a widget="button" iconCls="icon-delete" onclick="remove()">删除</a>
+			<a widget="button" iconCls="icon-edit" onclick="edit()">权限授权</a>
+		</div>
+		<div widget="autosize">
+			<div widget="datagrid" name="grid" style="width: 100%; height: 100%;" url="rush/orgname/getList"  allowalternating="true">
+				<div type="indexcolumn" width="15" header="序号"></div>
+				<div field="cname"  width="15" header="姓名">></div>
+				<div field="cguid"    visible="false"></div>
+				<div field="org_name" width="70"  header="拥有权限"></div>
+			</div>
+			
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	 	var grid = aos.get('grid');
+		grid.load();
+		function search(){
+			var params={CNAME:aos.get('cname').value};
+			grid.load(params);
+		}
+		
+		function edit(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			var param = {};
+			param['pageState'] = 'editold';
+			param['cguid'] = data.cguid; 
+			param['cname'] = data.cname;
+			
+			aos.showWindow('canvas/orgname/companyedit', param, '400px', '600px', '功能授权',function(rtnValue){
+				grid.reload();
+			});
+		}
+	
+		
+		function remove(){
+			var data = grid.getSelected();
+			if(!data){
+				aos.alert('请选择一条数据。');
+				return;
+			}
+			
+			aos.post({
+				url:"rush/orgname/deleteAuth",
+				data:{cguid:data.cguid},
+				success:function(){
+					aos.tip('删除成功。');
+					grid.reload();
+				}
+					
+			});
+		}
+		
+		function add(){
+			var param = {};
+			param['pageState'] = 'editnew';
+			aos.showWindow('canvas/orgname/companyadd', param, '500px', '900px', '权限授权添加', function(rtnValue){
+				grid.reload();
+			});
+		}
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</script>
+</html>
\ No newline at end of file
diff --git a/resource/html/orgname/companyedit.html b/resource/html/orgname/companyedit.html
new file mode 100644
index 0000000..0c9b60f
--- /dev/null
+++ b/resource/html/orgname/companyedit.html
@@ -0,0 +1,60 @@
+<html  login="false">
+	<head>
+		<title>权限分配</title>
+	</head>
+	<body>
+		<div widget="toolbar" style="padding:10px;border:0;">
+			<input widget="edit" name="cname" label="人员" allowInput="false"/>
+			<input widget="hidden"  name="cguid" />
+				<a widget="button" iconCls="icon-save" onclick="save" linkToState="editold,editnew">保存</a>
+			    <a widget="button" iconCls="icon-exit" onclick="CloseWindow()">退出</a>
+		</div>
+		<div widget="autosize">
+			         <div name="tree" widget="tree" expandOnLoad="0" showTreeIcon="true"  valueField="id"
+			         textField="text" url="company/auth/getcompanyTreeData"  
+			         transformtotreeformat="true"  showCheckBox="true"  
+			         referWidgets="selectStrategy;currentOrgnId;orgntype;root" style="width: 100%; height: 100%;"></div>
+				
+		</div>
+	</body>
+	<script type="text/javascript">
+	   
+		var grid = aos.get('tree');
+		   grid.load(); /*checkedField="id" */
+			function init(param){
+				var cname=param['cname'];
+				var cguid=param['cguid'];
+				aos.get('cname').setValue(cname);
+				aos.get('cguid').setValue(cguid);
+					aos.post({
+						url:"rush/orgname/getinfobyid",
+						data:param,
+						success:function(rtnData){
+							
+							grid.setValue(rtnData.id);
+						}
+					});
+				} 
+			
+		
+			function save(){
+				var param={};
+				param['id']=grid.getValue();
+				param['cguid']=aos.get('cguid').value;
+				  if(param['id']!=""){
+		        aos.post({
+					url:"rush/orgname/addCompany",
+					data:param,
+					success:function(rtnData){
+					     aos.tip('修改成功');
+					}
+				});
+				  }
+				  else{
+					  aos.tip('请分配权限'); 
+				  }
+				  }
+			
+			
+	</script>
+</html>
\ No newline at end of file
diff --git a/src/rush/BureauAction.java b/src/rush/BureauAction.java
index 2ef2411..144ed03 100644
--- a/src/rush/BureauAction.java
+++ b/src/rush/BureauAction.java
@@ -6,6 +6,7 @@ import com.aisino.aosplus.core.mvc.DataContext;
 import com.aisino.aosplus.core.mvc.annotation.Action;
 import com.aisino.aosplus.core.mvc.annotation.Request;
 import com.aisino.aosplus.core.mvc.bean.Params;
+import com.aisino.aosplus.session.SessionHelper;
 import com.aisino.hangxin.common.POIExcelMapExportUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -13,6 +14,7 @@ import org.apache.log4j.Logger;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,29 +26,47 @@ public class BureauAction {
 
 
     @Request.Post("getlist")
-    public Map getCustomerById(Params params) {
+    public Map getlist(Params params) {
         String searchbegindate=params.getString("searchbegindate");
         String searchenddate=params.getString("searchenddate");
         String phone=params.getString("phone");
         String empno=params.getString("empno");
         String calltype=params.getString("calltype");
-
-      //  String sql=" select  id,emp_no,create_time,phone_num,start_time,end_time,record_duration," +
-              //  "call_type,record_url  path,caller_phone, area_name ,'播放' AS play ,'下载' as  down from   area_call_record where 1=1 ";
+        String manyi=params.getString("manyi");
+        String company=params.getString("company");
 
 
+        String userId = SessionHelper.getCurrentUserId();
+        params.put("userId",userId);
+        List<Map> returns = DbHelper.getDbService().queryMapListById("rushfee_org.getOrgListByUser", params);
+        StringBuffer sb = new StringBuffer();
+        if(returns.size()!=0) {
+            sb.append("d.city_name in (");
+            for (int i = 0; i < returns.size(); i++) {
+                sb.append("'" + returns.get(i).get("text") + "'");
+                if (i < returns.size() - 1) {
+                    sb.append(",");
+                }
+            }
+            sb.append(")");
+        }
+        else{
+            sb.append("1=2");
+        }
        String sql=" SELECT c.CALLID, c.CALLEENO,c.CALLERNO phone_num ,c.AGENTID emp_no,c.BEGINTIME start_time,c.ENDTIME end_time,to_char(c.BEGINTIME,'yyyy-mm-dd')   create_time, " +
                "c.SECONDS record_duration ,REGEXP_REPLACE( REGEXP_REPLACE(c.FILENAME,'Z:\\\\1',''),'\\\\','/') path ,c.CALLTYPE call_type,c.NAME,s.TEL_RECORD_ID,s.RECODER_ID," +
-               "s.ENTRY_DATE,s.ORGID,s.ORGNAME area_name,s.PRODUCTNAME,s.CUSTOMER_ID,s.QUESTION_ID," +
+               "s.ENTRY_DATE,s.ORGID,s.ORGNAME,d.city_name area_name,c.satisfaction manyidu,s.PRODUCTNAME,s.CUSTOMER_ID,s.QUESTION_ID," +
                "s.QUESTION_ANSWER,s.CUSTOMER_NAME,s.CUSTOMER_TAX_ID,s.tel ,s.MOBILE caller_phone,s.PERSON_TEL, s.question_content," +
                "s.CONTACT,s.TEL_DATE ,s.TEL_PERSON,s.ENTRY_PERSON ,'播放' AS play ,'下载' as  down FROM "  +
-               "CALLSYS_TRECORDFAILINFO c  " +
-               "LEFT JOIN CRM_SM_TEL_RECORD s ON c.CALLID = s.CALLID  where 1=1  ";
+               "CALLSYS_TRECORDFAILINFO c   left join tel_dic_city d on c.calleeno=d.callee_no  " +
+               "LEFT JOIN CRM_SM_TEL_RECORD s ON c.CALLID = s.CALLID  where   "+sb.toString();
 
         String timeSql="";
         String typeSql="";
         String phoneSql="";
         String empnoSql="";
+        String manyiSql="";
+        String companySql="";
         if(searchbegindate!=null&&searchenddate!=null){
             timeSql=" and to_char(c.BEGINTIME,'yyyy-mm-dd')>='"+searchbegindate +"'  and to_char(c.BEGINTIME,'yyyy-mm-dd')<='"+searchenddate+"'" ;
         }
@@ -54,17 +74,30 @@ public class BureauAction {
             typeSql=" and c.CALLTYPE='"+calltype+"'";
         }
         if(phone!=null){
-            phoneSql=" and  s.MOBILE like '%"+phone+"%'" ;
+            phoneSql=" and  (s.MOBILE like '%"+phone+"%' or c.CALLERNO='"+phone+"')"  ;
         }
         if(empno!=null){
             empnoSql=" and  c.AGENTID like '%"+empno+"%'" ;
         }
+        if(manyi!=null){
+            if(manyi.equals("4")){
+                manyiSql=" and  c.satisfaction  is null "  ;
+            }
+            else{
+                manyiSql=" and  c.satisfaction = '"+manyi+"'" ;
+            }
+
+        }
+
+        if(company!=null){
+           companySql="  and  d.city_name='"+company+"'";
+
+        }
 
 
 
 
-
-        Map map = DbHelper.getDbService().queryPageMapList(sql+timeSql+typeSql+phoneSql+empnoSql, params);
+        Map map = DbHelper.getDbService().queryPageMapList(sql+timeSql+typeSql+phoneSql+empnoSql+manyiSql+companySql, params);
         List<Map> records = (List<Map>) map.get("records");
         for(Map m : records){
                     m.put("path","http://10.1.1.54:8082"+m.get("path"));
@@ -80,7 +113,109 @@ public class BureauAction {
 
     }
 
+    @Request.Post("getlistBysj")
+    public Map getlistBysj(Params params) {
+        String searchbegindate=params.getString("searchbegindate");
+        String searchenddate=params.getString("searchenddate");
+        String phone=params.getString("phone");
+        String empno=params.getString("empno");
+        String calltype=params.getString("calltype");
+        String company=params.getString("company");
+        String manyi=params.getString("manyi");
+        String userId = SessionHelper.getCurrentUserId();
+        params.put("userId",userId);
+        /*
+        这一部分是限制税局授权  现在先不要 换成分公司授权
+        List<Map> returns = DbHelper.getDbService().queryMapListById("rushfee_org.getOrgListByUser", params);
+        StringBuffer sb = new StringBuffer();
+       if(returns.size()!=0) {
+           sb.append("d.city_name in (");
+           for (int i = 0; i < returns.size(); i++) {
+               sb.append("'" + returns.get(i).get("text") + "'");
+               if (i < returns.size() - 1) {
+                   sb.append(",");
+               }
+           }
+           sb.append(")");
+       }
+       else{
+           sb.append("1=2");
+       }*/
 
+        List<Map> returns = DbHelper.getDbService().queryMapListById("orgname.getOrgListByUser", params);
+        StringBuffer sb = new StringBuffer();
+        if(returns.size()!=0) {
+            sb.append("(s.ORGID in (");
+            for (int i = 0; i < returns.size(); i++) {
+                sb.append("'" + returns.get(i).get("text") + "'");
+                if (i < returns.size() - 1) {
+                    sb.append(",");
+                }
+            }
+            sb.append(") or  s.ORGNAME  is null) ");
+        }
+        else{
+            sb.append("1=2");
+        }
+
+        String sql=" SELECT c.CALLID, c.CALLEENO,c.CALLERNO phone_num ,c.AGENTID emp_no,c.BEGINTIME start_time,c.ENDTIME end_time,to_char(c.BEGINTIME,'yyyy-mm-dd')   create_time, " +
+                "c.SECONDS record_duration ,REGEXP_REPLACE( REGEXP_REPLACE(c.FILENAME,'Z:\\\\1',''),'\\\\','/') path ,c.CALLTYPE call_type,c.NAME,s.TEL_RECORD_ID,s.RECODER_ID," +
+                "s.ENTRY_DATE,s.ORGID,s.ORGNAME org_name,d.city_name area_name,s.PRODUCTNAME,s.CUSTOMER_ID,s.QUESTION_ID," +
+                "s.QUESTION_ANSWER,s.CUSTOMER_NAME,s.CUSTOMER_TAX_ID,s.tel ,s.MOBILE caller_phone,s.PERSON_TEL, s.question_content," +
+                "s.CONTACT,s.TEL_DATE ,s.TEL_PERSON,s.ENTRY_PERSON ,'播放' AS play ,'下载' as  down FROM "  +
+                "CALLSYS_TRECORDFAILINFO c   left join tel_dic_city d on c.calleeno=d.callee_no  " +
+                "LEFT JOIN CRM_SM_TEL_RECORD s ON c.CALLID = s.CALLID  where c.CALLERNO='12366' and  "+ sb.toString();
+
+        String timeSql="";
+        String typeSql="";
+        String phoneSql="";
+        String empnoSql="";
+        String companySql="";
+        String manyiSql="";
+        if(searchbegindate!=null&&searchenddate!=null){
+            timeSql=" and to_char(c.BEGINTIME,'yyyy-mm-dd')>='"+searchbegindate +"'  and to_char(c.BEGINTIME,'yyyy-mm-dd')<='"+searchenddate+"'" ;
+        }
+        if(calltype!=null){
+            typeSql=" and c.CALLTYPE='"+calltype+"'";
+        }
+        if(phone!=null){
+            phoneSql=" and  s.MOBILE like '%"+phone+"%'" ;
+        }
+        if(empno!=null){
+            empnoSql=" and  c.AGENTID like '%"+empno+"%'" ;
+        }
+        if(company!=null){
+            companySql="  and  d.city_name='"+company+"'";
+
+        }
+        if(manyi!=null){
+            if(manyi.equals("4")){
+                manyiSql=" and  c.satisfaction  is null "  ;
+            }
+            else{
+                manyiSql=" and  c.satisfaction = '"+manyi+"'" ;
+            }
+
+        }
+
+
+
+
+        Map map = DbHelper.getDbService().queryPageMapList(sql+timeSql+typeSql+phoneSql+empnoSql+companySql+manyiSql, params);
+        List<Map> records = (List<Map>) map.get("records");
+        for(Map m : records){
+            m.put("path","http://10.1.1.54:8082"+m.get("path"));
+            if(m.get("path")==null){
+                m.put("play","无录音");
+                m.put("path","");
+            }
+
+        }
+
+
+        return  map;
+
+    }
 
 
 
@@ -91,23 +226,42 @@ public class BureauAction {
         String phone=params.getString("phone");
         String empno=params.getString("empno");
         String calltype=params.getString("calltype");
-
+        String manyi=params.getString("manyi");
+        String company=params.getString("company");
         //  String sql=" select  id,emp_no,create_time,phone_num,start_time,end_time,record_duration," +
         //  "call_type,record_url  path,caller_phone, area_name ,'播放' AS play ,'下载' as  down from   area_call_record where 1=1 ";
-
+        String userId = SessionHelper.getCurrentUserId();
+        params.put("userId",userId);
+        List<Map> returns = DbHelper.getDbService().queryMapListById("rushfee_org.getOrgListByUser", params);
+        StringBuffer sb = new StringBuffer();
+        if(returns.size()!=0) {
+            sb.append("d.city_name in (");
+            for (int i = 0; i < returns.size(); i++) {
+                sb.append("'" + returns.get(i).get("text") + "'");
+                if (i < returns.size() - 1) {
+                    sb.append(",");
+                }
+            }
+            sb.append(")");
+        }
+        else{
+            sb.append("1=2");
+        }
 
         String sql=" SELECT c.CALLID, c.CALLEENO,c.CALLERNO phone_num ,c.AGENTID emp_no,c.BEGINTIME start_time,c.ENDTIME end_time,to_char(c.BEGINTIME,'yyyy-mm-dd')   create_time, " +
                 "c.SECONDS record_duration  ,decode(c.CALLTYPE,'0','呼入','1','呼出') call_type,c.NAME,s.TEL_RECORD_ID,s.RECODER_ID," +
-                "s.ENTRY_DATE,s.ORGID,s.ORGNAME area_name,s.PRODUCTNAME,s.CUSTOMER_ID,s.QUESTION_ID," +
+                "s.ENTRY_DATE,s.ORGID,s.ORGNAME,d.city_name area_name,decode(c.satisfaction,'1','非常满意','2','满意','3','不满意','暂未评价') manyidu,s.PRODUCTNAME,s.CUSTOMER_ID,s.QUESTION_ID," +
                 "s.QUESTION_ANSWER,s.CUSTOMER_NAME,s.CUSTOMER_TAX_ID,s.tel ,s.MOBILE caller_phone,s.PERSON_TEL, s.question_content," +
                 "s.CONTACT,s.TEL_DATE ,s.TEL_PERSON,s.ENTRY_PERSON  FROM "  +
-                "CALLSYS_TRECORDFAILINFO c  " +
-                "LEFT JOIN CRM_SM_TEL_RECORD s ON c.CALLID = s.CALLID  where 1=1  ";
+                "CALLSYS_TRECORDFAILINFO c   left join tel_dic_city d on c.calleeno=d.callee_no  " +
+                "LEFT JOIN CRM_SM_TEL_RECORD s ON c.CALLID = s.CALLID  where   "+ sb.toString();
 
         String timeSql="";
         String typeSql="";
         String phoneSql="";
         String empnoSql="";
+        String manyiSql="";
+        String companySql="";
         if(searchbegindate!=null&&searchenddate!=null){
             timeSql=" and to_char(c.BEGINTIME,'yyyy-mm-dd')>='"+searchbegindate +"'  and to_char(c.BEGINTIME,'yyyy-mm-dd')<='"+searchenddate+"'" ;
         }
@@ -122,11 +276,19 @@ public class BureauAction {
         }
 
 
+        if(manyi!=null){
+            if(manyi.equals("4")){
+                manyiSql=" and  c.satisfaction  is null "  ;
+            }
+            else{
+                manyiSql=" and  c.satisfaction = '"+manyi+"'" ;
+            }
+
+        }
 
 
 
-
-        List<Map> resultMap = DbHelper.getDbService().queryMapList(sql+timeSql+typeSql+phoneSql+empnoSql, params);
+        List<Map> resultMap = DbHelper.getDbService().queryMapList(sql+timeSql+typeSql+phoneSql+empnoSql+manyiSql, params);
 
 
         HttpServletResponse response = DataContext.getResponse();
@@ -136,15 +298,98 @@ public class BureauAction {
                 fileName, sheetName);
 
         // Map Key属性
-        String titleColumn1[] = {"emp_no","name", "create_time", "phone_num", "start_time", "end_time", "record_duration","call_type","caller_phone","customer_name","question_content","question_answer","productname","area_name"};
+        String titleColumn1[] = {"emp_no","name", "create_time", "phone_num", "start_time", "end_time", "record_duration","call_type","caller_phone","customer_name","question_content","question_answer","productname","area_name","manyidu"};
         // Excel列名
-        String titleName1[] = {"工号", "姓名","日期","电话号码", "开始时间", "结束时间", "录音时长(秒)", "呼叫类型","来电人电话号码", "公司名称", "咨询内容","解决办法","问题类型","所属地区"};
+        String titleName1[] = {"工号", "姓名","日期","电话号码", "开始时间", "结束时间", "录音时长(秒)", "呼叫类型","来电人电话号码", "公司名称", "咨询内容","解决办法","问题类型","所属地区","满意度"};
         // Excel 列宽
-        int titleSize[] = {30, 30, 30, 30, 30, 30,30, 30,30, 30, 30,30, 30,30};
+        int titleSize[] = {30, 30, 30, 30, 30, 30,30, 30,30, 30, 30,30, 30,30,30};
 
         // 内容书写，返回输出流
         pee.wirteListMapExcel(titleColumn1, titleName1, titleSize, resultMap);
     }
 
 
+
+
+    @Request.Get("getcompanybyshuiju")
+    @Request.Post("getcompanybyshuiju")
+    public List getListtree(Params params){
+        return DbHelper.getDbService().queryMapListById("companyauth.getcompanybyshuiju", params);
+
+    }
+
+
+    @Request.Get("addCompany")
+    @Request.Post("addCompany")
+    public void addcompany(Params params){
+        DbHelper.getDbService().update("delete from SHUIJU_QUYU_USER t where t.user_id = ?", params.getString("cguid"));
+        String id = params.getString("id");
+        String[] str = id.split(",");
+        for (int i = 0; i < str.length; i++) {
+            String cguid = params.getString("cguid");
+            DbHelper.getDbService().update("insert into  SHUIJU_QUYU_USER (user_id,org_name) values(?,?)",cguid,str[i]);
+        }
+
+    }
+
+
+    @Request.Post("getbureauList")
+    @Request.Get("getbureauList")
+    public Map getbureauList(Params params){
+        return DbHelper.getDbService().queryPageMapListById("companyauth.getbureauList", params);
+
+    }
+
+    @Request.Post("deleteAuth")
+    public void delete(Params params){
+
+        DbHelper.getDbService().update("delete from SHUIJU_QUYU_USER t where t.user_id = ?", params.getString("cguid"));
+    }
+
+
+    @Request.Get("getinfobyid")
+    @Request.Post("getinfobyid")
+    public Map<String, String> loadInfo(Params params){
+
+        Map returns= DbHelper.getDbService().queryMap("SELECT a.cguid, a.cname, \n" +
+                "                  REPLACE ( wm_concat (ORG_NAME), ',', ',' ) AS id \n" +
+                "                FROM  ( \n" +
+                "                    SELECT\n" +
+                "                  Z.CGUID,\n" +
+                "                 Z.CNAME,\n" +
+                "                   T.ORG_NAME\n" +
+                "                  FROM\n" +
+                "                  SHUIJU_QUYU_USER t,\n" +
+                "                   aos_rms_user z \n" +
+                "                     WHERE\n" +
+                "                  z.cguid = t.USER_ID \n" +
+                "                 AND t.USER_ID = ? \n" +
+                "                    ) a \n" +
+                "                   GROUP BY\n" +
+                "                        cguid,\n" +
+                "                  cname", params.getString("cguid"));
+        String string=(String) returns.get("id");
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("id", string);
+        return map;
+    }
+
+
+
+
+    @Request.Post("getallList")
+    @Request.Get("getallList")
+    public Map getallList(Params params){
+        return DbHelper.getDbService().queryPageMapListById("companyauth.getallListshuiju", params);
+
+    }
+
+    @Request.Get("getOrgListByUser")
+    public List<Map> getOrgListByUser(Params params){
+        String userId = SessionHelper.getCurrentUserId();
+        params.put("userId",userId);
+        List<Map> returns = DbHelper.getDbService().queryMapListById("rushfee_org.getOrgListByUser", params);
+        return  returns;
+    }
+
 }
diff --git a/src/rush/OrgAction.java b/src/rush/OrgAction.java
index ed44b27..3a44867 100644
--- a/src/rush/OrgAction.java
+++ b/src/rush/OrgAction.java
@@ -19,6 +19,15 @@ public class OrgAction {
 		List<Map> returns = DbHelper.getDbService().queryMapListById("rushfee_org.getOrgList", params);
 		return  returns;
 	}
+
+
+	@Request.Get("getOrgListByUser")
+	public List<Map> getOrgListByUser(Params params){
+		String userId = SessionHelper.getCurrentUserId();
+		params.put("userId",userId);
+		List<Map> returns = DbHelper.getDbService().queryMapListById("rushfee_org.getOrgListByUser", params);
+		return  returns;
+	}
 	
 	//根据账号权限获得对应组织信息
 		@SuppressWarnings("rawtypes")
diff --git a/src/rush/OrgNameAction.java b/src/rush/OrgNameAction.java
new file mode 100644
index 0000000..854dbbf
--- /dev/null
+++ b/src/rush/OrgNameAction.java
@@ -0,0 +1,89 @@
+package rush;
+
+
+import com.aisino.aosplus.core.dao.DbHelper;
+import com.aisino.aosplus.core.mvc.annotation.Action;
+import com.aisino.aosplus.core.mvc.annotation.Request;
+import com.aisino.aosplus.core.mvc.bean.Params;
+import org.apache.log4j.Logger;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Action("rush/orgname")
+public class OrgNameAction {
+    // 日志记录
+    private static Logger logger = Logger.getLogger(OrgNameAction.class);
+
+    @Request.Post("getList")
+    @Request.Get("getList")
+    public Map getList(Params params){
+        return DbHelper.getDbService().queryPageMapListById("orgname.getList", params);
+
+    }
+
+
+    @Request.Post("getallList")
+    @Request.Get("getallList")
+    public Map getallList(Params params){
+        return DbHelper.getDbService().queryPageMapListById("orgname.getallList", params);
+
+    }
+
+    @Request.Post("deleteAuth")
+    public void delete(Params params){
+
+        DbHelper.getDbService().update("delete from RUSH_CRMCOMP_TO_USER_ORGNAME t where t.rush_userid = ?", params.getString("cguid"));
+    }
+
+
+    @Request.Get("getcompanyTreeData")
+    @Request.Post("getcompanyTreeData")
+    public List getListtree(Params params){
+        return DbHelper.getDbService().queryMapListById("orgname.getcompany", params);
+
+    }
+
+    @Request.Get("getinfobyid")
+    @Request.Post("getinfobyid")
+    public Map<String, String> loadInfo(Params params){
+
+        Map returns= DbHelper.getDbService().queryMap("SELECT a.cguid, a.cname, "
+                +"   REPLACE ( wm_concat (CRMCOMPANYID), ',', ',' ) AS id "
+                +" FROM  ( "
+                +"    SELECT"
+                +"  Z.CGUID,"
+                +" Z.CNAME,"
+                +"   T.CRMCOMPANYID"
+                +"  FROM"
+                +"  RUSH_CRMCOMP_TO_USER_ORGNAME t,"
+                +"   aos_rms_user z "
+                +"     WHERE"
+                +"  z.cguid = t.RUSH_USERID "
+                +" AND t.RUSH_USERID = ? "
+                +"    ) a "
+                +"   GROUP BY"
+                +"        cguid,"
+                +"  cname", params.getString("cguid"));
+        String string=(String) returns.get("id");
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("id", string);
+        return map;
+    }
+
+
+    @Request.Get("addCompany")
+    @Request.Post("addCompany")
+    public void addcompany(Params params){
+        DbHelper.getDbService().update("delete from RUSH_CRMCOMP_TO_USER_ORGNAME t where t.rush_userid = ?", params.getString("cguid"));
+        String id = params.getString("id");
+        String[] str = id.split(",");
+        for (int i = 0; i < str.length; i++) {
+            String cguid = params.getString("cguid");
+            DbHelper.getDbService().update("insert into  RUSH_CRMCOMP_TO_USER_ORGNAME (rush_userid,crmcompanyid) values(?,?)",cguid,str[i]);
+        }
+
+    }
+
+}