完善功能

app/admin/controller/member/MemberController.php

@@ -4,6 +4,8 @@ namespace app\admin\controller\member;
 
 use app\admin\service\member\MemberService;
 use app\admin\validate\member\MemberValidate;
+use app\model\Family;
+use app\model\FamilyMember;
 use support\Db;
 use support\Request;
 
@@ -36,6 +38,34 @@ class MemberController
         return json_success('', $data);
     }
 
+    public function selectFamilyMemberList(Request $request)
+    {
+        $keywords = $request->get('keywords');
+        if (!$keywords) {
+            return json_fail("查询错误");
+        }
+        // 创建的家庭
+        $family = Family::where('join_family_creator_member_id', $request->get('memberId'))->get()->toArray();
+        if (!$family) {
+            return json_success('暂无数据');
+        }
+        $familyIds = array_column($family, 'family_id');
+
+        $res = FamilyMember::whereIn('join_family_id', $familyIds)
+            ->where("family_member_name", 'like', '%' . $keywords . '%')
+            ->get()
+            ->toArray();
+        $data = [];
+        foreach ($res as $item) {
+            $data[] = [
+                'key' => $item['join_family_member_id'],
+                'value' => $item['family_member_name']
+            ];
+        }
+
+        return json_success('', $data);
+    }
+
     public function list(Request $request)
     {
 

app/admin/controller/sys_manage/UserController.php

@@ -112,6 +112,11 @@ class UserController
         return UserService::updateStatus($id, $request->post());
     }
 
+    public function updatePassword($id, Request $request)
+    {
+        return UserService::updatePassword($id, $request->post());
+    }
+
     /**
      * @Desc 删除用户
      * @Author Gorden

app/admin/service/auth/AuthService.php

@@ -70,7 +70,7 @@ class AuthService
 
     public static function userInfo(Request $request)
     {
-        $user = SysUser::select('join_user_role_id', 'join_user_dept_id', 'user_status', 'user_category', 'user_name', 'user_login_name', 'user_mobile', 'user_remark', 'user_extend_json', 'user_addtimes')
+        $user = SysUser::select('user_id', 'join_user_role_id', 'join_user_dept_id', 'user_status', 'user_category', 'user_name', 'user_login_name', 'user_mobile', 'user_remark', 'user_extend_json', 'user_addtimes')
             ->where('user_id', $request->adminId)
             ->first()
             ->toArray();

app/admin/service/member/MemberService.php

@@ -2,6 +2,8 @@
 
 namespace app\admin\service\member;
 
+use app\model\Family;
+use app\model\FamilyMember;
 use app\model\Member;
 use app\model\MemberCert;
 use app\model\MemberDevice;
@@ -121,10 +123,24 @@ class MemberService
      */
     public static function deviceList($id)
     {
+        $family = Family::where('join_family_creator_member_id', $id)->get()->toArray();
+        $familyMemberIds = '';
+        if ($family) {
+            $familyIds = array_column($family, 'family_id');
+            $familyMember = FamilyMember::whereIn('join_family_id', $familyIds)->get()->toArray();
+            $familyMemberIds = array_column($familyMember, 'join_family_member_id');
+        }
+
         $rows = MemberDevice::leftJoin('device', 'device.device_id', '=', 'member_device.join_member_device_id')
             ->leftJoin('member', 'member.member_id', '=', 'member_device.join_device_member_id')
-            ->select('device.device_category', 'device.device_name', 'device.device_type', 'member.member_mobile', 'member_device.*')
-            ->where('member_device.join_device_master_member_id', $id)
+            ->leftJoin('family_member', 'family_member.join_family_member_id', '=', 'member_device.join_device_member_id')
+            ->select('device.device_category', 'device.device_name', 'device.device_type', 'member.member_mobile', 'member_device.*','family_member.family_member_name')
+            ->when(!empty($familyMemberIds), function ($query) use ($familyMemberIds) {
+                $query->whereIn('member_device.join_device_master_member_id', $familyMemberIds);
+            })
+            ->when(empty($familyMemberIds), function ($query) use ($id) {
+                $query->where('member_device.join_device_master_member_id', $id);
+            })
             ->get()
             ->toArray();
 

app/admin/service/sys_manage/UploadService.php

@@ -24,6 +24,7 @@ class UploadService
                 'path' => $config['uri'] . date('Ymd') . '/' . $res[0]['save_name'],
                 'size' => $res[0]['size'],
                 'mime_type' => $res[0]['mime_type'],
+                'src' => getenv("STORAGE_DOMAIN").$config['uri'] . date('Ymd') . '/' . $res[0]['save_name'],
             ];
 
             $insertData = [

app/admin/service/sys_manage/UserService.php

@@ -3,6 +3,7 @@
 namespace app\admin\service\sys_manage;
 
 use app\model\SysUser;
+use support\Db;
 use support\Request;
 
 class UserService
@@ -150,6 +151,34 @@ class UserService
         return json_success('用户状态修改成功');
     }
 
+    /**
+     * @Desc 修改密码
+     * @Author Gorden
+     * @Date 2024/4/19 10:01
+     *
+     * @param $id
+     * @param $params
+     * @return \support\Response
+     */
+    public static function updatePassword($id, $params)
+    {
+        if ($params['user_login_pass'] != $params['confirmNewPassword']){
+            return json_fail('两次密码不一致');
+        }
+        $user = SysUser::where('user_id', $id)->first();
+        if (md5(sha1($params['userPassword'])) != $user->user_login_pass) {
+            return json_fail('原密码错误');
+        }
+        try {
+            SysUser::where('user_id',$id)->update(['user_login_pass'=>md5(sha1($params['user_login_pass']))]);
+
+            return json_success('密码修改成功');
+        }catch (\Exception $e){
+            dump($e->getMessage());
+            return json_fail('密码修改失败');
+        }
+    }
+
     /**
      * @Desc 删除用户
      * @Author Gorden

app/admin/validate/asset/HouseTypeValidate.php

@@ -7,7 +7,7 @@ use think\Validate;
 class HouseTypeValidate extends Validate
 {
     protected $rule = [
-        'asset_id' => 'require|integer',
+        'asset_id' => 'require',
         'join_asset_category_id' => 'integer',
         'asset_key|资产标识' => 'require|alphaDash',
         'asset_classify|归类' => 'max:32',

config/app.php

@@ -15,6 +15,7 @@
 use support\Request;
 
 return [
+    'language' => 'zh_CN',
     'debug' => getenv('APP_DEBUG'),
     'error_reporting' => E_ALL,
     'default_timezone' => 'Asia/Shanghai',

route/admin.php

@@ -101,6 +101,7 @@ Route::group('/admin', function () {
             Route::post('/add', [\app\admin\controller\sys_manage\UserController::class, 'addUser']);
             Route::post('/update/{id:\w+}', [\app\admin\controller\sys_manage\UserController::class, 'updateUser']);
             Route::post('/updateStatus/{id:\w+}', [\app\admin\controller\sys_manage\UserController::class, 'updateStatus']);
+            Route::post('/updatePassword/{id:\w+}', [\app\admin\controller\sys_manage\UserController::class, 'updatePassword']);
             Route::delete('/delete', [\app\admin\controller\sys_manage\UserController::class, 'delUser']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
@@ -478,6 +479,7 @@ Route::group('/admin', function () {
         // 用户管理
         Route::group('', function () {
             Route::get('/selectList', [\app\admin\controller\member\MemberController::class, 'selectList']);
+            Route::get('/selectFamilyMemberList', [\app\admin\controller\member\MemberController::class, 'selectFamilyMemberList']);
             Route::get('/list', [\app\admin\controller\member\MemberController::class, 'list']);
             Route::post('/add', [\app\admin\controller\member\MemberController::class, 'add']);
         });