合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1036

@@ -64,6 +64,8 @@ class RenewProjectController extends BaseController
         $map['delete_status'] = 0;
         $map['delete_status'] = 0;
         if(empty($map['type'])){
         if(empty($map['type'])){
             $map['type'] = ['in',[2,3,4]];
             $map['type'] = ['in',[2,3,4]];
+        }else{
+            $map['type'] = $param['type'];
         }
         }
         $map['remain_day'] = ['<=',15];
         $map['remain_day'] = ['<=',15];
         return $map;
         return $map;