companyProjecet.git

			@@ -116,7 +116,7 @@
			// 处理管理员账号
			$userLoginModel = new UserLoginModel();
			$admin = $userLoginModel->where('user_id', '=', $data['user_id'])->where('is_super', '=', 1)->find();
			if ($userLoginModel->detail(['real_name'=>$data['real_name'],'user_id'=>['neq'=>$data['user_id']]])){
			if ($userLoginModel->detail(['user_name'=>$data['user_name'],'user_id'=>['neq'=>$data['user_id']]])){
			throw new \Exception('该账号已存在');
			}
			// 如果传入了用户名,则更新或创建管理员账号
			@@ -132,7 +132,7 @@
			];

			if (!empty($data['password'])) {
			$loginData['user_name'] = salt_hash($data['user_name']);
			$loginData['user_name'] = $data['user_name'];
			$loginData['password'] = salt_hash($data['password']);
			}

			@@ -282,8 +282,9 @@
			$result = $this->save($saveData);
			}
			$userLoginModel = new UserLoginModel();
			if ($userLoginModel->detail(['real_name'=>$data['real_name']])){
			throw new \Exception('该账号已存在');
			if ($userLoginModel->detail(['user_name'=>$data['user_name']])){
			$this->error = '该账号已存在';
			return false;
			}
			// 创建管理员账号
			if (isset($data['user_name']) && !empty($data['user_name'])) {
			@@ -300,9 +301,10 @@
			];

			if (!$userLoginModel->save($loginData)) {
			throw new \Exception('管理员账号创建失败');
			$this->error = '管理员账号创建失败';
			return false;
			}
			$role_id = RoleModel::where('operations_level','=',$data['operations_level'])->value('role_id');
			$role_id = RoleModel::where('region_level','=',$data['operations_level'])->value('role_id');
			// 这里可以分配默认角色ID,暂时不分配
			$model = new UserRole();
			$add_arr[] = [