Merge branch 'master' of git.huaml.com:zhh/huahuibao

app-hd/controllers/WorkController.php

@@ -52,6 +52,9 @@ class WorkController extends BaseController
             $status = $get['status'];
             $where['status'] = $status;
         }
+        if (isset($get['fromType']) && is_numeric($get['fromType'])) {
+            $where['fromType'] = $get['fromType'];
+        }
         $list = WorkClass::getWorkList($where);
         $list['today'] = date("Y-m-d");
         util::success($list);