Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Proorder.php

@@ -57,7 +57,8 @@ public function __construct(App $app)
             $db->where(function ($query) use ($param) {
                 //所属角色
                 $role = $this->checkRole();
-                if (!empty($role['write']) || $role['roleid'] == 33) $query->whereFindInSet('roleid', $role['roleid']);
+//                if (!empty($role['write']) || $role['roleid'] == 33) $query->whereFindInSet('roleid', $role['roleid']);
+                $query->whereFindInSet('roleid', $role['roleid']);
 
                 //本人id
                 $user = GetUserInfo($param['token']);
@@ -114,7 +115,9 @@ public function __construct(App $app)
         $db->where(function ($query) use ($param) {
             //所属角色
             $role = $this->checkRole();
-            if (!empty($role['write']) || $role['roleid'] == 33) $query->whereFindInSet('roleid', $role['roleid']);
+
+//            if (!empty($role['write']) || $role['roleid'] == 33) $query->whereFindInSet('roleid', $role['roleid']);
+            $query->whereFindInSet('roleid', $role['roleid']);
 
             //本人id
             $user = GetUserInfo($param['token']);

app/admin/controller/Resigninfo.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -108,9 +109,12 @@ class Resigninfo extends Base
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s"),
         ];
-        $in = Db::name('resign_info')->insert($data);
-        $stn = ["order_code"=>Db::name('resign_info')->getLastInsID(),"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
-        ActionLog::logAdd($this->post['token'],$stn,"LZJJ",$status,$stn);
+        $in = Db::name('resign_info')->insertGetId($data);
+        $stn = ["order_code"=>'',"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
+        ActionLog::logAdd(['id'=>isset($resign_uid["data"]['id'])?$resign_uid["data"]['id']:0,'nickname'=>$ri],$stn,"LZJJ",$status,$stn);
+
+        $process=["order_code"=>'',"order_id"=>$in,"order_status"=>$status,"order_type"=>'LZJJ',"before_status"=>0];
+        ProcessOrder::AddProcess(['id'=>isset($resign_uid["data"]['id'])?$resign_uid["data"]['id']:0,'nickname'=>$ri],$process);
         return $in ? error_show(0,"添加成功") : error_show(1002,"添加失败");
     }
     public function selec(){
@@ -170,6 +174,8 @@ class Resigninfo extends Base
       if($it){
           $stn = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
           ActionLog::logAdd($this->post['token'],$stn,"LZJJ",0,$stn);
+          $process=["order_code"=>'',"order_id"=>$id,"order_status"=>$status,"order_type"=>'LZJJ',"before_status"=>0];
+          ProcessOrder::AddProcess(['id'=>isset($resign_uid["data"]['id'])?$resign_uid["data"]['id']:0,'nickname'=>$ri],$process);
           return error_show(0,"编辑成功");
       }else{
           return error_show(1002,"编辑失败");
@@ -212,6 +218,8 @@ class Resigninfo extends Base
         if($sv){
             $stn = ["order_code"=>$id,"status"=>$tn,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$stn,"LZJJ",$stauts,$st);
+            $process=["order_code"=>'',"order_id"=>$id,"order_status"=>$stauts,"order_type"=>'LZJJ',"before_status"=>$tn];
+            ProcessOrder::AddProcess($this->post['token'],$process);
             return error_show(0,"状态更新成功");
         }else{
             return error_show(1002,"状态更新失败");