Merge branch 'master' of http://gogs.langye.net:3000/tanyuan/wx.sstbc.com

app/Console/Commands/UpdateLetter.php

@@ -43,9 +43,16 @@ class UpdateLetter extends Command
     public function handle()
     {
         // 更新用户首字母
-        $users = User::whereNull('letter')->whereNotNull('name')->limit(100)->get();
+        $users = User::whereNull('letter')
+            ->where(function ($query) {
+                $query->whereNotNull('name')->orWhereNotNull('username');
+            })->limit(100)->get();
         foreach ($users as $user) {
-            $user->letter = strtoupper(Pinyin::abbr(mb_substr($user->name, 0, 1))[0]);
+            $name = $user->username;
+            if ($user->name) {
+                $name = $user->name;
+            }
+            $user->letter = strtoupper(Pinyin::abbr(mb_substr($name, 0, 1))[0]);
             $user->save();
         }
         return self::SUCCESS;

app/Http/Controllers/Mobile/CourseController.php

@@ -804,9 +804,9 @@ class CourseController extends CommonController
             $list = $list->orderBy('letter')->paginate(20);
         }
         // 获取当前用户参与报名
-        $userCourseSigns = CourseSign::where('user_id',$this->getUserId())->where('status', 1)->get();
+        $userCourseSigns = CourseSign::where('user_id', $this->getUserId())->where('status', 1)->get();
         // 获取当前用户允许的课程体系
-        $open_course_types = explode(',', $this->getUser()->open_course_types);
+        $coursesTypeIds = Course::whereIn('id', $userCourseSigns->pluck('course_id'))->pluck('type')->toArray();
 
         foreach ($list as $user) {
             $user->open_mobile = false;
@@ -819,7 +819,8 @@ class CourseController extends CommonController
                 continue;
             }
             // 获取用户的课程体系
-            $coursesTypeIds = Course::whereIn('id', $userCourseSigns->pluck('course_id'))->pluck('type')->toArray();
+            // 获取当前用户允许的课程体系，数组
+            $open_course_types = explode(',', $user->open_course_types);
             // 判断当前用户和$user课程体系是否存在交集
             if (count(array_intersect($coursesTypeIds, $open_course_types)) > 0) {
                 $user->open_mobile = true;

database/migrations/2025_09_28_111112_alert_supply_demands_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('supply_demands', function (Blueprint $table) {
+            $table->string('fund_company')->nullable()->comment('融资公司');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('supply_demands', function (Blueprint $table) {
+            //
+        });
+    }
+};