rabin 3 years ago
parent
commit
cb69efe5ac
2 changed files with 22 additions and 4 deletions
  1. 16 0
      service/agent/database/member_agreement.php
  2. 6 4
      service/agent/lib/Agreement.php

+ 16 - 0
service/agent/database/member_agreement.php

@@ -454,6 +454,22 @@ return array
             'col' => '*',
         ),
 
+        'getOlds' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'mid' => 'yes',
+                'order_id' => 'yes',
+                'agreement_id' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('id' => 'desc'),
+            'col' => '*',
+        ),
+
+
         'getOne' => array
         (
             # 匹配的正则或函数 选填项

+ 6 - 4
service/agent/lib/Agreement.php

@@ -452,8 +452,9 @@ class Agreement
                 $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) {
+            $old = Dever::db('agent/member_agreement')->getOlds(array('mid' => $info['mid'], 'agreement_id' => 1));
+            if ($old && isset($old[1])) {
+                $old = $old[1];
                 $role = Dever::db('setting/role')->find($old['role']);
                 $oname = $this->name($oagreement, $old, $role);
                 $sdate = date('Y年m月d日', $old['sdate']);
@@ -508,8 +509,9 @@ class Agreement
         	$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) {
+        $old = Dever::db('agent/member_agreement')->getOlds(array('mid' => $info['mid'], 'agreement_id' => 1));
+        if ($old && isset($old[1])) {
+            $old = $old[1];
             $old_role = Dever::db('setting/role')->find($old['role']);
             $oname = $this->name($oagreement, $old, $old_role);
             $sdate = date('Y年m月d日', $old['sdate']);