区域代理清空

app/controller/admin/user/User.php

@@ -466,12 +466,15 @@ class User extends BaseController
         if (!$this->repository->exists($id))
             return app('json')->fail('数据不存在');
         $where = array();
-        $where[] = array('agent_district_id' , '=', $agent_district_id);
+        if($agent_district_id){
-        $where[] = array('uid' , '<>', $id);
+            $where[] = array('agent_district_id' , '=', $agent_district_id);
-        $exist = $this->repository->getWhere($where);
+            $where[] = array('uid' , '<>', $id);
-        if($exist){
+            $exist = $this->repository->getWhere($where);
-            return app('json')->fail('该代理已存在');
+            if($exist){
+                return app('json')->fail('该代理已存在');
+            }
         }
+
         $this->repository->update($id, array('agent_district_id' => $agent_district_id, 'agent_district' => $agent_district));
         return \app('json')->success('修改成功');
     }

view/admin/src/views/user/list/index.vue

@@ -481,11 +481,14 @@ export default {
     methods: {
         submitArea(){
             if(!this.selectedValue){
-                this.$message.warning('请选择区域');
+              var agent_district_id = 0;
-                return;
+              var agent_district = '';
+            }else{
+              var agent_district_id = this.selectedValue[this.selectedValue.length-1];
+              var agent_district = this.regionText;
             }
 
-            setAreaApi(this.selectedUser.uid,{agent_district_id:this.selectedValue[this.selectedValue.length-1],agent_district:this.regionText}).then((res) => {
+            setAreaApi(this.selectedUser.uid,{agent_district_id:agent_district_id,agent_district:agent_district}).then((res) => {
                 this.getList('')
                 this.areaDialogVisible = false;
             }).catch(({ message }) => {