阶段性提交

app/controller/CompanyItem.php

@@ -326,6 +326,19 @@ class CompanyItem extends BaseController
         } else return json_show(0, '获取成功', get_part($itemids));
     }
 
+    //获取详情
+    public function info()
+    {
+        $id = $this->request->post('id/d', 0, 'trim');
+
+        $rs = Db::name('company_item')
+            ->field(true)
+            ->where(['id' => $id, 'is_del' => 0])
+            ->findOrEmpty();
+
+        return json_show(0, '获取部门详情成功', $rs);
+    }
+
     //获取某个用户所属部门名称
     //$uid int 用户id
     //$cache bool 是否启用缓存，(默认启用，不启用的话直接从数据库查)
@@ -362,5 +375,46 @@ class CompanyItem extends BaseController
 
     }
 
+    //根据某个关键字匹配所有子级部门及用户
+    public function getCompanyItemUserByName()
+    {
+
+        $company_name = $this->request->post('company_name', '', 'trim');
+
+        //先查询所有的部门id(包括子部门)
+        $company_ids = Db::name("company_item")
+            ->where(['is_del' => 0])
+            ->whereLike('name', '%' . $company_name . '%')
+            ->column('id');
+
+        $pid = $company_ids;
+        for ($i = 1; $i > 0; $i++) {
+            $tmp = Db::name("company_item")
+                ->where(['is_del' => 0])
+                ->whereIn('pid', $pid)
+                ->column('id');
+
+            if (empty($tmp)) break;
+            else {
+                $company_ids = array_merge($company_ids, $tmp);
+                $pid = $tmp;
+            }
+        }
+
+        $company_ids = array_unique($company_ids);
+
+        sort($company_ids);
+
+        $uid = Db::name('account_item')
+            ->alias('a')
+            ->leftJoin('account b', 'b.id=a.account_id')
+            ->where(['b.is_del' => 0, 'b.status' => 1])
+            ->whereIn('a.itemid', $company_ids)
+            ->column('a.account_id');
+
+        return json_show(0, '获取成功', $uid);
+
+
+    }
 
 }

app/controller/UserInfo.php

@@ -386,7 +386,7 @@ class UserInfo extends BaseController
         ]);
         if ($validate->check($post) == false) return json_show(1004, $validate->getError());
         Db::startTrans();
-        $uiq = Db::table("sys_account")->where(["mobile" => $post['mobile']])->find();
+        $uiq = Db::table("sys_account")->field('id')->where(["mobile" => $post['mobile']])->find();
         if ($uiq) {
             return json_show(1002, "手机号已注册！");
         }
@@ -394,7 +394,7 @@ class UserInfo extends BaseController
         try {
             $salt = makeSalt();
             $password = sha1("dingding123" . $salt);
-            $data = [
+            $da = [
                 'username' => $post['mobile'],
                 "password" => $password,
                 "salt" => $salt,
@@ -404,7 +404,7 @@ class UserInfo extends BaseController
                 "addtime" => date("Y-m-d H:i:s"),
                 "updatetime" => date("Y-m-d H:i:s")
             ];
-            $reuslt = Db::table('sys_account')->insert($data, true);
+            $reuslt = Db::table('sys_account')->insert($da, true);
             if ($reuslt) {
                 $data = [
                     "nickname" => $post['nickname'],
@@ -466,4 +466,137 @@ class UserInfo extends BaseController
             return json_show(1002, "账户注册失败" . $e->getMessage());
         }
     }
+
+    //添加超管账号
+    public function addAdminAccount()
+    {
+
+        $post = $this->request->filter('trim')->post();
+
+        $tmp = Db::table("sys_account")
+            ->field('id')
+            ->where(["mobile" => $post['mobile'], 'is_del' => 0])
+            ->findOrEmpty();
+        if ($tmp) return json_show(1002, "手机号已注册");
+
+        try {
+            $date = date("Y-m-d H:i:s");
+            $salt = makeSalt();
+            $password = sha1("dingding123" . $salt);
+            $da = [
+                'username' => $post['mobile'],
+                "password" => $password,
+                "salt" => $salt,
+                "mobile" => $post['mobile'],
+                "source" => "paltadd",
+                "status" => 1,
+                "level" => 1,
+                "addtime" => date("Y-m-d H:i:s"),
+                "updatetime" => date("Y-m-d H:i:s")
+            ];
+            $reuslt = Db::table('sys_account')->insert($da, true);
+            if ($reuslt) {
+                $data = [
+                    "nickname" => $post['nickname'],
+                    "mobile" => $post['mobile'],
+                    "email" => $post['email'],
+                    "portrait" => "",
+                    "sex" => 1,
+                    "post" => "",
+                    "department" => "",
+                    "account_id" => $reuslt,
+                    "status" => 1,
+                    "addtime" => $date,
+                    "updatetime" => $date
+                ];
+                $user = Db::table("sys_user")->insert($data);
+                if ($user != false) {
+                    $acount = new AccountCompany();
+                    if (!empty($post['companyArr'])) {
+                        $company_insert = [];
+                        foreach ($post['companyArr'] as $company) {
+                            $company_insert[] = [
+                                "account_id" => $reuslt,
+                                "companyCode" => $company['companyCode'],
+                                "companyName" => $company['companyName'],
+                                "company_type" => $company['company_type'],
+                                "is_main" => $company['is_main'],
+                                "status" => 1,
+                                "is_del" => 0,
+                                "addtime" => $date,
+                                "updatetime" => $date,
+                            ];
+                        }
+                        $u = $acount->saveAll($company_insert);
+                    } else {
+                        $company_insert = [
+                            "account_id" => $reuslt,
+                            "companyCode" => '',
+                            "companyName" => '',
+                            "company_type" => '0',
+                            "is_main" => 1,
+                            "status" => 1,
+                            "is_del" => 0,
+                            "addtime" => $date,
+                            "updatetime" => $date,
+                        ];
+                        $u = $acount->save($company_insert);
+                    }
+
+                    if ($u == false) throw new Exception("账户新建失败");
+                    Db::commit();
+                    return json_show(0, "账户注册成功", ["userid" => $reuslt, "nickname" => $post['nickname']]);
+                }
+            }
+            Db::rollback();
+            return json_show(1002, "账户注册失败");
+
+        } catch (\Exception $e) {
+            Db::rollback();
+            return json_show(1002, "账户注册失败" . $e->getMessage());
+        }
+
+    }
+
+    //修改密码通过旧密码
+    public function passSetByPassword()
+    {
+
+        $param = $this->request->only(['uid', 'old_pass', 'new_pass'], 'post', 'trim');
+
+        $val = Validate::rule([
+            'uid|用户ID' => 'require|number|gt:0',
+            'old_pass|旧密码' => 'require|max:255',
+            'new_pass|新密码' => 'require|min:6|max:255',
+        ]);
+
+        if ($val->check($param) == false) return json_show(1004, $val->getError());
+
+        $acc = Db::name("account")
+            ->field('id,password,salt,status')
+            ->where(['id' => $param['uid'], "is_del" => Account::$account_del])
+            ->findOrEmpty();
+        if (empty($acc)) return json_show(1003, '账户不存在');
+
+        if ($acc['status'] == Account::$account_end) return json_show(1003, '账户已禁用');
+
+        $sha1 = sha1($param['old_pass'] . $acc['salt']);
+        if ($sha1 != $acc['password']) return json_show(1003, '密码错误');
+
+
+        $salt = makeSalt();
+        $password = sha1($param['new_pass'] . $salt);
+
+        $rs = Db::name('account')
+            ->where(['id' => $param['uid'], "is_del" => Account::$account_del])
+            ->update([
+                'password' => $password,
+                'salt' => $salt,
+                'updatetime' => date('Y-m-d H:i:s')
+            ]);
+
+        return $rs ? json_show(0, '修改密码成功') : json_show(1004, '修改密码失败');
+
+    }
+
 }

route/app.php

@@ -23,8 +23,10 @@ Route::rule('setpasswd', 'UserInfo/PassSet');
 Route::rule('setcompany', 'UserInfo/setCompany');
 Route::rule('companystatus', 'UserInfo/setCompanyStatus');
 Route::rule('useradd', 'UserInfo/userAdd');
+Route::rule('add_admin_account', 'UserInfo/addAdminAccount');
 Route::rule('userDelete', 'UserInfo/userDelete');
 Route::rule('userlistbycompany', 'UserInfo/UserListByCompany');
+Route::rule('passSetByPassword', 'UserInfo/passSetByPassword');
 
 //【公司账号管理】
 Route::rule('userCompanyBasicAdd', 'UserCompanyBasic/add');
@@ -69,6 +71,8 @@ Route::rule('stat', 'CompanyItem/status');
 Route::rule('userp', 'CompanyItem/userp');
 Route::rule('query', 'CompanyItem/query');
 Route::rule('get_part', 'CompanyItem/getPart');
-Route::rule('get_company_name_by_uid', 'CompanyItem/getCompanyNameByUid');
+Route::rule('ciinfo', 'CompanyItem/info');
+Route::rule('get_company_name_by_uid', 'CompanyItem/getCompanyNameByUid');//获取用户id对应的部门名称
+Route::rule('get_company_item_user_by_name', 'CompanyItem/getCompanyItemUserByName');//获取部门名称下的所有用户