Merge branch 'dev' of http://120.46.155.214:3000/wugg/cxinv into dev

app/admin/BaseController.php

@@ -58,9 +58,7 @@ class BaseController extends base{
             $level =Db::name("role")->where(["id"=>$role['roleid']])->find();
             if($role['status']==0 || $level['status']==0 ){
             	$this->level='';
-            }else{
-            	 $this->level=$level['level']>1 ?2 :($level['level']??1);
-            }
+            }else $this->level = $effetc['data']['level'];//$this->level=$level['level']>1 ?2 :($level['level']??1);
              return ["code"=>0,"message"=>"验证通过"];
      }
 

app/admin/controller/Menu.php

@@ -16,49 +16,52 @@ class Menu extends BaseController{
 	* @throws \think\db\exception\DbException
 	* @throws \think\db\exception\ModelNotFoundException
 	 */
-    public function MenuList(){
-    	$condition =["status"=>1,"is_del"=>0];
-    	 if($this->level=='') return app_show(10000,"账户角色账户已禁用",[]);
-		if ($this->level!=1){
-			 $role = Db::name("role_action")->where("role_id","=",$this->roleid)->find();
+    public function MenuList()
+    {
+        $condition = ["status" => 1, "is_del" => 0];
 
-	        if($role==false){
-	            return app_show(0,"获取成功",[]);
-	        }
-	        $action = Db::name("action")->where(['id'=>explode(",",$role['action_conllect']),"status"=>1,"is_del"=>0])
-	        ->column("id,menuid,action_code");
-	        if (empty($action)){
-	            return app_show(0,"获取成功",[]);
-	        }
-	        $MenuAction=[];
-	        foreach ($action as $value){
-	        $MenuAction[$value['menuid']][]=$value['action_code'];
-	        }
+        $level = $this->request->post('level/d',$this->level,'trim');
+        if ($level == '') return app_show(10000, "账户角色账户已禁用", []);
+        if ($level != 1) {
+            $role = Db::name("role_action")->where("role_id", "=", $this->roleid)->find();
 
-	        $menuid= array_column($action,"menuid");
-			$condition['id']=$menuid;
-		}else{
-			$action = Db::name("action")->where(["status"=>1,"is_del"=>0])->column("id,action_code,menuid");
-			 $MenuAction=[];
-	        foreach ($action as $value){
-	        $MenuAction[$value['menuid']][]=$value['action_code'];
-	        }
-	        $menuid= array_column($action,"menuid");
-	        $condition['id']=$menuid;
-		}
-        $menuAll =Db::name("admin_menu")
-        ->where($condition)
-        ->where("level",">=",$this->level)
-        ->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,level,status,weight");
-        $list=[];
-        foreach ($menuAll as $value){
-           $value['action']=$MenuAction[$value['id']]??[];
-            makeMenu($value,$list);
+            if ($role == false) {
+                return app_show(0, "获取成功", []);
+            }
+            $action = Db::name("action")->where(['id' => explode(",", $role['action_conllect']), "status" => 1, "is_del" => 0])->column("id,menuid,action_code");
+            if (empty($action)) return app_show(0, "获取成功", []);
+
+            $MenuAction = [];
+            foreach ($action as $value) {
+                $MenuAction[$value['menuid']][] = $value['action_code'];
+            }
+
+            $menuid = array_column($action, "menuid");
+            $condition['id'] = $menuid;
+            $condition['level'] = [0,$level];
+        } else {
+            $action = Db::name("action")->where(["status" => 1, "is_del" => 0])->column("id,action_code,menuid");
+            $MenuAction = [];
+            foreach ($action as $value) {
+                $MenuAction[$value['menuid']][] = $value['action_code'];
+            }
+            $menuid = array_column($action, "menuid");
+            $condition['id'] = $menuid;
+            $condition['level'] = [0,$level,2];
+        }
+
+        $menuAll = Db::name("admin_menu")
+            ->where($condition)
+            ->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,level,status,weight");
+        $list = [];
+        foreach ($menuAll as $value) {
+            $value['action'] = $MenuAction[$value['id']] ?? [];
+            makeMenu($value, $list);
         }
-        $keys =array_column($list, 'weight');
-        array_multisort($keys,SORT_DESC,$list);
-        $list=MenuTree($list,0);
-        return app_show(0,"获取成功",$list);
+        $keys = array_column($list, 'weight');
+        array_multisort($keys, SORT_DESC, $list);
+        $list = MenuTree($list, 0);
+        return app_show(0, "获取成功", $list);
     }
     /**菜单设置列表
     * @return \think\response\Json|void

app/admin/controller/User.php

@@ -96,7 +96,7 @@ class User extends BaseController{
 	 * 用户列表
 	 */
     public function  userList(){
-    	$post=$this->request->only(["token"=>"","nickname"=>"","relaComNo"=>"","islevel"=>"","username"=>"","companyNo"=>"","status"=>"","page"=>1,"size"=>10],"post");
+    	$post=$this->request->only(["token"=>"","nickname"=>"","relaComNo"=>"","islevel"=>"","username"=>"","companyNo"=>"","status"=>"","page"=>1,"size"=>10,'level'=>''],"post");
        if($this->level==1){
        	$companyNo = $post['companyNo']??"";
        }else{
@@ -154,7 +154,7 @@ class User extends BaseController{
 	 * 用户列表
 	 */
     public function  userSingleList(){
-    	$post=$this->request->only(["token"=>"","nickname"=>"","relaComNo"=>"","islevel"=>"","username"=>"","companyNo"=>"","status"=>"","page"=>1,"size"=>10],"post");
+    	$post=$this->request->only(["token"=>"","nickname"=>"","relaComNo"=>"","islevel"=>"","username"=>"","companyNo"=>"","status"=>"","page"=>1,"size"=>10,'level'=>''],"post");
        if($this->level==1){
        	$companyNo = $post['companyNo']??"";
        }else{
@@ -660,23 +660,43 @@ class User extends BaseController{
         if ($validate->check($post) == false) return error_show(1004, $validate->getError());
 
         $rs = add_supplier_account($post);
-        if (!isset($rs['code']) || $rs['code'] != 0) return app_show(1004, $rs['message'],$rs['data']);
-
-        $up = Db::name("user_role")->insert([
-            "uid" => $rs['data']["userid"],
-            "nickname" => $rs['data']["nickname"],
-            "roleid" => env('default_supplier_addcount_role_id',90),//需要专门为供应商账号指定一个默认的角色id，要同步到采销
-            "companyNo" => '',
-            "company_type" => '',
-            "status" => 1,
-            "is_main" => 1,
-            "is_del" => 0,
-            "addtime" => date("Y-m-d H:i:s"),
-            "updatetime" => date("Y-m-d H:i:s"),
-        ]);
-        if ($up == false) return error_show(1004, '供应商账号分配角色失败');
+        if (!isset($rs['code']) || $rs['code'] != 0) return error_show($rs['code'], $rs['message'],$rs['data']);
+
+        $insert_data=[];
+        $date = date('Y-m-d H:i:s');
+        foreach ($post['companyArr'] as $company){
+            $insert_data[]=[
+                "uid" => $rs['data']["userid"],
+                "nickname" => $rs['data']["nickname"],
+                "roleid" => env('default_supplier_addcount_role_id',90),//需要专门为供应商账号指定一个默认的角色id，要同步到采销
+                "companyNo" => $company['companyCode'],
+                "company_type" => 1,
+                "status" => 1,
+                "is_main" => $company['is_main'],
+                "is_del" => 0,
+                "addtime" => $date,
+                "updatetime" => $date,
+            ];
+        }
 
-        return app_show(0, '添加供应商账号成功');
+        if($insert_data) Db::name('user_role')->insertAll($insert_data);
+
+//        $up = Db::name("user_role")->insert([
+//            "uid" => $rs['data']["userid"],
+//            "nickname" => $rs['data']["nickname"],
+//            "roleid" => env('default_supplier_addcount_role_id',90),//需要专门为供应商账号指定一个默认的角色id，要同步到采销
+//            "companyNo" => '',
+//            "company_type" => '',
+//            "status" => 1,
+//            "is_main" => 1,
+//            "is_del" => 0,
+//            "addtime" => date("Y-m-d H:i:s"),
+//            "updatetime" => date("Y-m-d H:i:s"),
+//        ]);
+//        if ($up == false) return error_show(1004, '供应商账号分配角色失败');
+
+//        return app_show(0, '添加供应商账号成功');
+        return app_show($rs['code'], $rs['message'],$rs['data']);
     }
 
 

app/command/Report.php

@@ -607,7 +607,7 @@ class Report extends Command
 		          ->leftJoin("invoice_good m","m.invNo=a.invNo and m.invtype=0 and m.is_del=0")
 //		          ->leftJoin('assoc d', 'd.viceCode=a.invNo and d.type=1')
 		          ->leftJoin('qrd_info e', 'e.sequenceNo=m.orderCode')
-		          ->leftJoin('cgd_info f', 'e.cgdNo=e.cgdNo')
+		          ->leftJoin('cgd_info f', 'f.sequenceNo=e.cgdNo')
 		          ->leftJoin('invoice_return g', 'g.invNo=a.invNo and g.status=2')
 		          ->where($where)
 		          ->order(['a.id' => 'desc'])