Merge branch 'feature/plan-auto-send-release'

7 years ago · 0b1cdb6c9f
parent a60e02b4f0 30f57c8942
commit 0b1cdb6c9f
2 changed files with 2 additions and 2 deletions
--- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
@ -306,7 +306,7 @@ class Tulanduo
     *        )
     * )
     */
-    public function tour_apart($all_pag_info, $need_complete=false)
+    public function tour_apart($all_pag_info)
    {
        $apart = array(); $ret = array();
        foreach ($all_pag_info as $key => $pag) {
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@ -96,7 +96,7 @@ class Group_model extends CI_Model {
                        $vgrd->ACI_PersonNum = intval($vaci->ACI_PersonNum);
                        $vgrd->ACI_ChildNum  = intval($vaci->ACI_ChildNum);
                        $vgrd->ACI_BabyNum   = intval($vaci->ACI_BabyNum);
-                        $vgrd->PAG_DEI_SN    = $vaci->PAG_DEI_SN;
+                        $vgrd->PAG_DEI_SN    = $vaci->PAG_DEI_SN ? $vaci->PAG_DEI_SN : 0;
                        if ( strval($vaci->ACI_ServiceType)==='D') {
                            $vgrd->PAG_Code = mb_strtoupper($vaci->PAG_Code);
                            $vgrd->PAG_ExtendType = mb_strtoupper($vaci->PAG_ExtendType);