Your Name 3 gadi atpakaļ
vecāks
revīzija
7729f29f8a
2 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. 1 1
      tool/work/database/info.php
  2. 5 2
      tool/work/lib/Appoint.php

+ 1 - 1
tool/work/database/info.php

@@ -84,7 +84,7 @@ if ($search_auth == 2) {
 $button = array();
 if ($search_auth == 1) {
     $button['回调界面'] = array('location',Dever::url('lib/appoint.back','work')); 
-    $button['电话回调界面'] = array('location',Dever::url('lib/appoint.callback','work')); 
+    // $button['电话回调界面'] = array('location',Dever::url('lib/appoint.callback','work')); 
 }
 $excel = false;
 if (Dever::load('manage/auth')->checkFunc('work.info', 'infoedit', '数据导出')) {

+ 5 - 2
tool/work/lib/Appoint.php

@@ -329,8 +329,11 @@ Class Appoint
 		foreach ($data['info_log'] as $k => $v) {
 			$data['info_log'][$k]['cdate'] = date('Y-m-d H:i:s',$v['cdate']);
 			$admin = Dever::db('manage/admin')->find($v['admin_id']);
-    		$admin_group = Dever::db('manage/group')->find($admin['group']);
-    		$data['info_log'][$k]['admin_group'] = $admin_group['name'].'   /   '.$admin['username'];
+            $admin['group'] = explode(',',$admin['group']);
+            foreach ($admin['group'] as $k1 => $v1) {
+                $admin_group = Dever::db('manage/group')->find(array('company_id'=>$data['info']['company_id'],'id'=>$v1));
+                $data['info_log'][$k]['admin_group'] = $admin_group['name'].'   /   '.$admin['username'];
+            }
     		$appoint = Dever::db('work/appoint')->find($v['appoint_id']);
     		if (isset($appoint) && $appoint) {
     			$data['info_log'][$k]['desc'] = $appoint['desc'];