no message

app/Http/Controllers/Api/ReportController.php

@@ -87,7 +87,7 @@ class ReportController extends AbstractController
         $username = trim(Request::input('username', ''));
         $builder->whereHas('sendUser', function ($query) use ($username) {
             if (!empty($username)) {
-                $query->where('users.email', 'LIKE', '%' . $username . '%');
+                $query->where("users.email", "LIKE", "%{$username}%");
             }
         });
         in_array($type, [Report::WEEKLY, Report::DAILY]) && $builder->whereType($type);

database/migrations/2021_12_29_170103_create_file_links_table.php

@@ -15,7 +15,7 @@ class CreateFileLinksTable extends Migration
     {
         Schema::create('file_links', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->bigInteger('file_id')->nullable()->default(0)->comment('项目ID');
+            $table->bigInteger('file_id')->nullable()->default(0)->comment('文件ID');
             $table->integer('num')->nullable()->default(0)->comment('累计访问');
             $table->string('code')->nullable()->default('')->comment('链接码');
             $table->timestamps();

resources/assets/js/components/UserAvatar.vue

@@ -87,7 +87,7 @@
             //
             this.subscribe = Store.subscribe('cacheUserActive', (data) => {
                 if (data.userid == this.userid) {
-                    this.user = data;
+                    this.setUser(data)
                 }
             });
         },
@@ -174,7 +174,7 @@
 
             userInfo(info) {
                 if (info.userid == this.userid) {
-                    this.user = info;
+                    this.setUser(info);
                 }
             },
 
@@ -190,12 +190,23 @@
                     return;
                 }
                 if (this.userid == this.userInfo.userid) {
-                    this.user = this.userInfo;
+                    this.setUser(this.userInfo);
                     return;
                 }
                 this.$store.dispatch("getUserBasic", {userid: this.userid});
             },
 
+            setUser(info) {
+                if (this.user && this.user.userimg != info.usering) {
+                    this.user = null
+                    this.$nextTick(() => {
+                        this.user = info
+                    })
+                } else {
+                    this.user = info
+                }
+            },
+
             onError() {
                 return false
             },

resources/assets/js/pages/manage/setting/password.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="setting-item submit">
-        <Alert v-if="userInfo.changepass" type="warning" showIcon style="margin-bottom:32px">{{$L('请先修改登录密码！')}}</Alert>
         <Form ref="formDatum" :model="formDatum" :rules="ruleDatum" label-width="auto" @submit.native.prevent>
+            <Alert v-if="userInfo.changepass" type="warning" showIcon style="margin-bottom:32px">{{$L('请先修改登录密码！')}}</Alert>
             <FormItem :label="$L('旧密码')" prop="oldpass">
                 <Input v-model="formDatum.oldpass" type="password"></Input>
             </FormItem>

resources/assets/sass/pages/page-file.scss

@@ -311,10 +311,6 @@
                     .avatar-char {
                         font-size: 18px;
                     }
-                    .permission {
-                        padding-left: 6px;
-                        font-size: 13px;
-                    }
                     .taskfont {
                         color: #aaaaaa;
                         font-size: 16px;