From 5eb6d22c08e35e7fbe387904349b79a0c10df333 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 10 Oct 2023 16:33:46 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E5=90=8E=E5=8F=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=A7=92=E8=89=B2=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=85=AC=E5=8F=B8=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UserController.php | 15 ++++++ .../controller/user/UserRoleController.php | 5 ++ app/adminapi/logic/user/UserLogic.php | 51 +++++++++++++++++++ app/common/logic/CompanyLogic.php | 5 ++ app/common/logic/user/UserRoleLogic.php | 7 +++ 5 files changed, 83 insertions(+) diff --git a/app/adminapi/controller/user/UserController.php b/app/adminapi/controller/user/UserController.php index aa5e04ba6..558928f90 100755 --- a/app/adminapi/controller/user/UserController.php +++ b/app/adminapi/controller/user/UserController.php @@ -18,6 +18,7 @@ use app\adminapi\lists\user\UserLists; use app\adminapi\logic\user\UserLogic; use app\adminapi\validate\user\AdjustUserMoney; use app\adminapi\validate\user\UserValidate; +use app\common\logic\CompanyLogic; use think\facade\Db; use think\facade\Request; use app\common\logic\contract\ContractLogic; @@ -55,6 +56,15 @@ class UserController extends BaseAdminController return $this->success('', $detail); } + public function add() + { + $params = $this->request->param(); + $re = UserLogic::addUser($params); + if ($re) { + return $this->success('添加成功'); + } + return $this->fail(UserLogic::getError()); + } /** * @notes 编辑用户信息 @@ -111,4 +121,9 @@ class UserController extends BaseAdminController return $this->fail(ContractLogic::getError()); } } + + public function getCompanyList() + { + return $this->data(CompanyLogic::getList()); + } } \ No newline at end of file diff --git a/app/adminapi/controller/user/UserRoleController.php b/app/adminapi/controller/user/UserRoleController.php index 26df1e01e..49b00b8a5 100644 --- a/app/adminapi/controller/user/UserRoleController.php +++ b/app/adminapi/controller/user/UserRoleController.php @@ -104,5 +104,10 @@ class UserRoleController extends BaseAdminController return $this->data($result); } + public function getList() + { + $list = UserRoleLogic::getList(); + return $this->data($list); + } } \ No newline at end of file diff --git a/app/adminapi/logic/user/UserLogic.php b/app/adminapi/logic/user/UserLogic.php index f04c7686c..79ef6caaf 100755 --- a/app/adminapi/logic/user/UserLogic.php +++ b/app/adminapi/logic/user/UserLogic.php @@ -20,6 +20,8 @@ use app\common\logic\BaseLogic; use app\common\model\contract\Contract; use app\common\model\dict\DictData; use app\common\model\user\User; +use app\common\service\ConfigService; +use think\facade\Config; use think\facade\Db; /** @@ -122,4 +124,53 @@ class UserLogic extends BaseLogic } } + public static function addUser($params) + { + // 手机号已被使用 + $mobileUser = User::where(['account' => $params['account']])->find(); + if (!empty($mobileUser)) { + self::setError('手机号已被注册'); + return false; + } + $count = User::where('company_id', $params['company_id'])->count(); + $value = DictData::where('id', 28)->value('value'); + if ($count >= $value) { + self::setError('你创建的账号已达上限'); + return false; + } + $userSn = User::createUserSn(); + $passwordSalt = Config::get('project.unique_identification'); + $password = create_password(123456, $passwordSalt); + if ($params['avatar'] != '') { + $avatar = $params['avatar']; + } else { + $avatar = ConfigService::get('default_image', 'user_avatar'); + } + $group_id = $params['group_id']; + + User::create([ + 'sn' => $userSn, + 'avatar' => $avatar, + 'is_captain' => $group_id == 2? 1: 0, + 'nickname' => $params['nickname'], + 'account' => $params['account'], + 'mobile' => $params['account'], + 'id_card' => $params['id_card'], + 'password' => $password, + 'channel' => 0, + 'sex' => $params['sex'], + 'province' => $params['province'], + 'city' => $params['city'], + 'area' => $params['area'], + 'street' => $params['street'], + 'village' => $params['village'], + 'brigade' => $params['brigade'], + 'address' => $params['address'], + 'qualification' => json_encode($params['qualification']), + 'company_id' => $params['company_id'], + 'group_id' => $group_id, + ]); + return true; + } + } \ No newline at end of file diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php index b2c2ddc03..557790006 100644 --- a/app/common/logic/CompanyLogic.php +++ b/app/common/logic/CompanyLogic.php @@ -424,5 +424,10 @@ class CompanyLogic extends BaseLogic $model->party_b = $companyId; $model->save(); return $model->id; + } + public static function getList() + { + return Company::field(['id', 'company_name', 'province', 'city', 'area', 'street', 'village', 'brigade'])->select()->toArray(); + } } diff --git a/app/common/logic/user/UserRoleLogic.php b/app/common/logic/user/UserRoleLogic.php index ff431f01b..e80070e52 100644 --- a/app/common/logic/user/UserRoleLogic.php +++ b/app/common/logic/user/UserRoleLogic.php @@ -109,4 +109,11 @@ class UserRoleLogic extends BaseLogic { return UserRole::findOrEmpty($params['id'])->toArray(); } + + public static function getList() + { + return UserRole::order(['id' => 'desc'])->field(['id', 'name']) + ->select() + ->toArray(); + } } \ No newline at end of file