合并分支 'zhl' 到 'master'

Zhl



查看合并请求 !16

@@ -197,6 +197,17 @@ class ATemplateController extends BaseController
         if (empty($referer) || false == in_array($referer, ['oa.cmer.com', 'quanqiusou.cn', 'zgjoa.globalso.com'])) {
         if (empty($referer) || false == in_array($referer, ['oa.cmer.com', 'quanqiusou.cn', 'zgjoa.globalso.com'])) {
             $this->response('非法请求',Code::SYSTEM_ERROR, []);
             $this->response('非法请求',Code::SYSTEM_ERROR, []);
         }
         }
-        $this->read($aTemplateLogic);
+
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $info = $aTemplateLogic->aTemplateRead();
+        $common = $aTemplateLogic->getHeadFooterList();
+        foreach ($common as $v) {
+            $info[$v['key']] = $v['values'];
+        }
+        $this->response('success',Code::SUCCESS,$info);
     }
     }
 }
 }