diff --git a/application/admin/controller/PaymentOrder.php b/application/admin/controller/PaymentOrder.php index ffbac69..cc9074c 100755 --- a/application/admin/controller/PaymentOrder.php +++ b/application/admin/controller/PaymentOrder.php @@ -2,7 +2,9 @@ namespace app\admin\controller; +use app\admin\command\Util; use app\admin\dao\GroupDao; +use app\admin\model\AuthGroup; use app\admin\service\PaymentOrderService; use app\common\controller\Backend; @@ -70,6 +72,12 @@ class PaymentOrder extends Backend * @return \think\response\Json */ public function setStatus(){ + $groupIds = $this->auth->getGroupIds(); + $authGroup = new AuthGroup(); + $cnt = $authGroup->where(["id" => ["in",$groupIds], "finance_flag" => 1])->count("*"); + if ($cnt==0) { + return json(Util::returnArrEr("未获取财务部门权限")); + } $params=$this->request->post(); $service = new PaymentOrderService(); $result = $service->setStatus($params['id'],$params['status']); diff --git a/application/admin/controller/ReceiptOrder.php b/application/admin/controller/ReceiptOrder.php index 45414f4..9ef2c45 100755 --- a/application/admin/controller/ReceiptOrder.php +++ b/application/admin/controller/ReceiptOrder.php @@ -2,7 +2,9 @@ namespace app\admin\controller; +use app\admin\command\Util; use app\admin\dao\GroupDao; +use app\admin\model\AuthGroup; use app\admin\service\ReceiptOrderDao; use app\admin\service\ReceiptOrderService; use app\common\controller\Backend; @@ -74,6 +76,12 @@ class ReceiptOrder extends Backend * @return \think\response\Json */ public function setStatus(){ + $groupIds = $this->auth->getGroupIds(); + $authGroup = new AuthGroup(); + $cnt = $authGroup->where(["id" => ["in",$groupIds], "finance_flag" => 1])->count("*"); + if ($cnt==0) { + return json(Util::returnArrEr("未获取财务部门权限")); + } $params=$this->request->post(); $service = new ReceiptOrderService(); $result = $service->setStatus($params['id'],$params['status']); diff --git a/application/admin/view/order_main/index.html b/application/admin/view/order_main/index.html index 6d293df..22fb072 100755 --- a/application/admin/view/order_main/index.html +++ b/application/admin/view/order_main/index.html @@ -440,7 +440,7 @@ }, memoList:[], showMemo:false, - isExpand: true, + isExpand: false, showTable:true } }, @@ -699,7 +699,7 @@