Merge branch 'monanxiao'

app/admin/controller/SupplyTeam.php

@@ -15,6 +15,7 @@ use app\admin\validate\SupplyTeamValidate;
 use think\exception\ValidateException;
 use think\facade\Db;
 use think\facade\View;
+use app\admin\model\Admin;
 
 class SupplyTeam extends BaseController
 
@@ -61,7 +62,6 @@ class SupplyTeam extends BaseController
         if (request()->isAjax()) {		
 			$param = get_params();	
             
-            return json($param);
             // 检验完整性
             try {
                 validate(SupplyTeamValidate::class)->check($param);
@@ -70,6 +70,32 @@ class SupplyTeam extends BaseController
                 return to_assign(1, $e->getError());
             }
 			
+            $userAdmin = Db::table('fa_szxc_information_useraddress')->where('admin_id', $param['user_id'])->find();
+            $parent_code = '';
+
+            // 验证用户级别，获取对应的区域代码
+            switch ($userAdmin['auth_range']) {
+                case 1:
+                    // 单独处理
+                    $parent_code = $userAdmin['village_code']; // 村
+                    break;
+                case 2:
+                    // 单独处理
+                    $parent_code = $userAdmin['street_id']; // 乡镇
+                    break;
+                case 3:
+                    // 单独处理
+                    $parent_code = $userAdmin['area_id']; // 区县
+                    break;
+                case 4:
+                    // 单独处理
+                    $parent_code = Db::table('fa_szxc_information_useraddress')->where('admin_id', $userAdmin['area_id'])->value('city_code'); // 市级
+                    break;
+            }
+     
+            $param['auth_range'] = $userAdmin['auth_range']; // 市区线级别
+            $param['parent_code'] = $parent_code; // 所属区域代码
+
             $this->model->addSupplyTeam($param);
             
         }else{
@@ -79,10 +105,13 @@ class SupplyTeam extends BaseController
             View::assign('level', $level);
 
             //获取用户信息
-            $this->users = Db::table('cms_admin')
-                ->where('status',1)
-                ->whereNotIn('id', [1])
-                ->field('id, username, nickname')->select();
+            $this->users = Db::table('fa_szxc_information_useraddress')
+                ->alias('a')
+                ->where('a.status',1)
+                ->whereNotIn('a.id', [1])
+                ->leftJoin ('nk_lihaink_cn.cms_admin b', 'a.admin_id = b.id')
+                ->field('b.id, b.username, b.nickname, a.admin_id, a.street_id, a.area_id, a.village_id, a.village_code, a.brigade_id')
+                ->select();
 
             View::assign('users', $this->users);
 			return view();

app/admin/validate/SupplyTeamValidate.php

@@ -14,10 +14,6 @@ class SupplyTeamValidate extends Validate
     'name' => 'require',
     'lng' => 'require',
     'lat' => 'require',
-    'area_id' => 'require',
-    'brokerage' => 'require',
-    'withdraw_brokerage' => 'require',
-    'free_brokerage' => 'require',
     'supply_level_id' => 'require',
     'user_id' => 'require',
 ];
@@ -26,10 +22,6 @@ class SupplyTeamValidate extends Validate
     'name.require' => '后台供应链团队分组名称不能为空',
     'lng.require' => '经度不能为空',
     'lat.require' => '维度不能为空',
-    'area_id.require' => '区县ID不能为空',
-    'brokerage.require' => '团队分佣金额不能为空',
-    'withdraw_brokerage.require' => '团队分佣已提现金额不能为空',
-    'free_brokerage.require' => '分佣冻结金额不能为空',
     'supply_level_id.require' => '团队所属等级不能为空',
     'user_id.require' => '团队后台负责人ID不能为空',
 ];