stanley-king 8 년 전
부모
커밋
7ee4ffdc28
4개의 변경된 파일12개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      admin/control/oper_sms.php
  2. 3 3
      helper/area/area_check.php
  3. 1 1
      helper/area/area_validator.php
  4. 7 2
      helper/area_helper.php

+ 1 - 1
admin/control/oper_sms.php

@@ -31,7 +31,7 @@
             $data = array('yuntx_id'=>$yuntx_id,'title'=>$sms_title,'content'=>$sms_content);
             $ret = $sms_template->insert($data);
 
-            if($ret == false) {
+            if($ret != false) {
                 showMessage(Language::get('nc_common_save_succ'),'index.php?act=oper_sms&op=index');
             }
             else {

+ 3 - 3
helper/area/area_check.php

@@ -31,7 +31,7 @@ class area_check
 
     protected function init()
     {
-        $items = $this->mod_area->where(array('area_parent_id' => 0,'enable' => 1))->field('area_id,area_parent_id,area_deep,area_name')->order('area_parent_id ASC,area_id ASC,area_name ASC')->select();
+        $items = $this->mod_area->where(array('area_parent_id' => 0,'enable' => 1))->field('area_id,area_parent_id,area_deep,area_name')->order('area_parent_id ASC,area_id ASC,area_name ASC')->limit(false)->select();
         foreach ($items as $item)
         {
             $area_id = intval($item['area_id']);
@@ -48,7 +48,7 @@ class area_check
 
     protected function load($parent_id)
     {
-        $items = $this->mod_area->where(array('area_parent_id' => $parent_id,'enable' => 1))->field('area_id,area_parent_id,area_deep,area_name')->order('area_parent_id ASC,area_id ASC,area_name ASC')->select();
+        $items = $this->mod_area->where(array('area_parent_id' => $parent_id,'enable' => 1))->field('area_id,area_parent_id,area_deep,area_name')->order('area_parent_id ASC,area_id ASC,area_name ASC')->limit(false)->select();
         foreach ($items as $item)
         {
             $area_id = intval($item['area_id']);
@@ -72,7 +72,7 @@ class area_check
 
     public function export()
     {
-        $items = $this->mod_area->where(array('area_parent_id' => 0,'enable' => 1))->field('area_id')->order('area_parent_id ASC,area_id ASC,area_name ASC')->select();
+        $items = $this->mod_area->where(array('area_parent_id' => 0,'enable' => 1))->field('area_id')->order('area_parent_id ASC,area_id ASC,area_name ASC')->limit(false)->select();
         $provins = [];
         foreach ($items as $item) {
             $area_id = intval($item['area_id']);

+ 1 - 1
helper/area/area_validator.php

@@ -140,7 +140,7 @@ class area_validator extends area_check
 
     private function fill()
     {
-        $items = $this->mod_area->where(array('area_parent_id' => 0,'enable' => 1))->field('area_id')->order('area_parent_id ASC,area_id ASC,area_name ASC')->select();
+        $items = $this->mod_area->where(array('area_parent_id' => 0,'enable' => 1))->field('area_id')->order('area_parent_id ASC,area_id ASC,area_name ASC')->limit(false)->select();
         $provins = [];
         foreach ($items as $item) {
             $area_id = intval($item['area_id']);

+ 7 - 2
helper/area_helper.php

@@ -23,7 +23,7 @@ class area_helper
         $fail_count = 0;
         if($maxid > 0)
         {
-            $items = $mod_area->where(array('area_name' => array('like',"%其它区%")))->field('area_id')->select();
+            $items = $mod_area->where(array('area_name' => array('like',"%其它区%")))->field('area_id')->limit(false)->select();
             foreach ($items as $item)
             {
                 $maxid += 1;
@@ -64,10 +64,12 @@ class area_helper
                     $city_id = $result_name['city']['area_id'];
                     $country_id = $result_name['country']['area_id'];
                     $narea_info = "{$result_name['province']['area_name']}\t{$result_name['city']['area_name']}\t{$result_name['country']['area_name']}";
-                    $mod_addr->where(array('address_id' => $address_id))->update(array('city_id' => $city_id,
+                    $ret = $mod_addr->where(array('address_id' => $address_id))->update(array('city_id' => $city_id,
                         'area_id' => $country_id,
                         'handled' => 10,
                         'area_info' => $narea_info));
+                    Log::record("fix_areaid address_id = {$address_id} handled",Log::DEBUG);
+
                 }
             }
             elseif($count == 2) {
@@ -93,6 +95,9 @@ class area_helper
             $area = $validator->country($area_id);
             $area_info = "{$area['province']['area_name']}\t{$area['city']['area_name']}\t{$area['country']['area_name']}";
             $mod_addr->where(array('address_id' => $address_id))->update(array('handled' => 11,'area_info' => $area_info));
+
+            Log::record("fix_areainfo address_id = {$address_id} handled",Log::DEBUG);
+
         }
     }
 }