edit

service/agent/lib/Agreement.php

@@ -451,12 +451,13 @@ class Agreement
                 $sdate = date('Y年m月d日');
                 $edate = date('Y年m月d日', strtotime('+3 year'));
                 $qdate = $sdate;
-
-                $old = Dever::db('agent/member_agreement')->getOld(array('mid' => $info['mid'], 'agreement_id' => 1));
-                if ($old) {
-                    $sdate = date('Y年m月d日', $old['sdate']);
-                    $edate = date('Y年m月d日', $old['edate']);
-                }
+            }
+            $old = Dever::db('agent/member_agreement')->getOld(array('mid' => $info['mid'], 'agreement_id' => 1));
+            if ($old) {
+                $role = Dever::db('setting/role')->find($old['role']);
+                $oname = $this->name($oagreement, $old, $role);
+                $sdate = date('Y年m月d日', $old['sdate']);
+                $edate = date('Y年m月d日', $old['edate']);
             }
         }
         
@@ -506,12 +507,13 @@ class Agreement
         	$sdate = date('Y年m月d日');
         	$edate = date('Y年m月d日', strtotime('+3 year'));
         	$qdate = $sdate;
-
-        	$old = Dever::db('agent/member_agreement')->getOld(array('mid' => $info['mid'], 'agreement_id' => 1));
-        	if ($old) {
-        		$sdate = date('Y年m月d日', $old['sdate']);
-        		$edate = date('Y年m月d日', $old['edate']);
-        	}
+        }
+        $old = Dever::db('agent/member_agreement')->getOld(array('mid' => $info['mid'], 'agreement_id' => 1));
+        if ($old) {
+            $old_role = Dever::db('setting/role')->find($old['role']);
+            $oname = $this->name($oagreement, $old, $old_role);
+            $sdate = date('Y年m月d日', $old['sdate']);
+            $edate = date('Y年m月d日', $old['edate']);
         }
 
         $company_name = '中食民安（北京）科技有限公司';
@@ -691,7 +693,7 @@ class Agreement
             }
         } else {
             $method = 'content_' . $agreement['type'];
-            $content = $this->$method($agreement, $info, array($role, $name, $oname, $sdate, $edate, $qdate));
+            $content = $this->$method($agreement, $info, array($old_role, $name, $oname, $sdate, $edate, $qdate));
 
             foreach ($content as $k => $v) {
                 $pdf->content($v['name'], $v['content'], $this->font_size);