Merge pull request '2.28号功能提交' (#179) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/179

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -312,11 +312,11 @@ class CompanyStatementPoolController extends ThinkController
         $infolist = SM("company_statement_info","tab_")->field("*,'1' as st")->where("pool_id = '{$id}' and pay_status!=1")->select();
         //获取母单
         $pool_info =  SM("company_statement_pool","tab_")->field('wm_statement_ids,statement_num,create_lack_ids,verify_status,is_payment,withdraw_type,statement_begin_time,statement_end_time')->where("id={$id}")->find();
-//        if(!empty($pool_info['create_lack_ids'])){
-//            $l_ids = $pool_info['create_lack_ids'];
-//            $lack_info = SM("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select();
-//            $infolist =array_merge($infolist,$lack_info);
-//        }
+        if(!empty($pool_info['create_lack_ids'])){
+            $l_ids = $pool_info['create_lack_ids'];
+            $lack_info = SM("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select();
+            $infolist =array_merge($infolist,$lack_info);
+        }
 
 //        dump($infolist);die();
 
@@ -1906,7 +1906,7 @@ class CompanyStatementPoolController extends ThinkController
             $clsi  =  SM("company_lack_statement_info","tab_")->where("is_pool = 1 and id in ({$create_lack_ids})")->find();
             $re_op = true;
             if(!empty($clsi)){
-//                $re_op = false; //被引用无法重算
+                $re_op = false; //被引用无法重算
             }
         }
         if($re_op){