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

app/admin/controller/Sale.php

@@ -666,7 +666,7 @@ class Sale extends Base
         try {
 
             $i=1;
-            foreach ($addrlist as $value) {
+            foreach ($addrlist as $key=>$value) {
                 $temp = [];
                 $addrs = [];
                 if ($value['addr_code'] !== '' && is_array($value['addr_code']) && !empty($value['addr_code'])) {

app/admin/controller/User.php

@@ -49,7 +49,7 @@ class User extends BaseController
             $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
             $depart = Db::name("depart_user")->where([["uid","=",$value['id']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
-            $value['status']=isset($role['status'])?$role['status']:'0';
+            $value['status']=$value['status']==1?($role['status']??"0"):'0';
             if(!empty($depart)){
                 $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("id,name,depart_link");
                 $value['depart_code'] = [];
@@ -101,7 +101,7 @@ class User extends BaseController
             ->field("roleid,role_name,business_all,uid,a.status")->find();
         $data['role_name']=isset($role['role_name']) ? $role['role_name'] :"";
         $data['roleid']=isset($role['roleid']) ? $role['roleid'] :"";
-        $data['status']=isset($role['status'])?$role['status']:'0';
+        $data['status']= $to['status']==1? ($role['status']??'0'):"0";
         $st = Db::name('user_business')->where(['userid'=>$role['uid'],"is_del"=>0])->field('businessid,is_main')->select()->toArray();
         $val=[];
         if (!empty($st)){
@@ -207,7 +207,7 @@ class User extends BaseController
             $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
             $depart = Db::name("depart_user")->where([["uid","=",$value['id']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
-            $value['status']=isset($role['status'])?$role['status']:'0';
+            $value['status']= $value['status']==1?($role['status']??"0"):'0';
             if(!empty($depart)){
                 $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
                     ->select()->toArray();
@@ -266,7 +266,7 @@ class User extends BaseController
             $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
             $depart = Db::name("depart_user")->where([["uid","=",$data['uid']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
-            $value['status']=isset($role['status'])?$role['status']:'0';
+            $value['status']=$value['status']==1?($role['status']??"0"):'0';
             if(!empty($depart)){
                 $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
                     ->select()->toArray();