From 0d57b8a16370ab9a9cff0bbc43f5a83fb9ce6665 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 27 Jul 2023 15:34:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=201.=20=20=E5=AE=A1=E6=89=B9=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=A8=A1=E7=89=88=20-=20=E6=8C=89=E9=92=AE=E7=99=BD?=
 =?UTF-8?q?=E8=89=B2=E4=BF=AE=E5=A4=8D=202.=20=20=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E7=9B=B8=E7=AD=89=203.=20?=
 =?UTF-8?q?=20=E5=AE=A1=E6=89=B9=E8=AF=84=E8=AE=BA=20-=200=E5=88=86?=
 =?UTF-8?q?=E9=92=9F=E6=8D=A2=E6=88=90=E5=88=9A=E5=88=9A=204.=20=20?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8A=A0=E5=85=A5=E9=83=A8=E9=97=A8=E4=B9=9F?=
 =?UTF-8?q?=E8=83=BD=E5=8F=91=E8=B5=B7=20=E5=AE=A1=E6=89=B9=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=205.=20=20=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=20-=20=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                               |  2 +-
 .../assets/js/pages/manage/approve/details.vue   |  8 ++++----
 .../assets/js/pages/manage/approve/index.vue     |  4 ----
 resources/assets/sass/pages/page-approve.scss    | 16 +++++++++++++++-
 resources/views/push/bot.blade.php               |  6 +++---
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 50a0ab3ee..e4da1fe44 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -150,7 +150,7 @@ services:
 
   approve:
     container_name: "dootask-approve-${APP_ID}"
-    image: "hitosea2020/go-approve:0.1.2"
+    image: "hitosea2020/go-approve:0.1.3"
     environment:
       TZ: "Asia/Shanghai"
       MYSQL_HOST: "${DB_HOST}"
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index b2fd8c984..a81e8e674 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -102,7 +102,7 @@
                             <Avatar :src="$A.apiUrl('../images/avatar/default_approval.png')" size="38"/>
                             <div class="approve-process-left">
                                 <p class="approve-process-name">{{$L('系统')}}</p>
-                                <p style="font-size: 12px;">{{$L('自动抄送')}}
+                                <p class="approve-process-desc">{{$L('自动抄送')}}
                                     <span style="color: #486fed;">
                                         {{ item.node_user_list?.map(h=>h.name).join(',') }} 
                                         {{$L('等'+item.node_user_list?.length+'人')}}
@@ -113,13 +113,13 @@
                     </TimelineItem>
 
                     <!-- 结束 -->
-                    <TimelineItem :key="key" :color="item.is_finished ? 'green' : '#ccc'" v-if="item.aprover_type == 'end'">
+                    <TimelineItem class="finish" :key="key" :color="item.is_finished ? 'green' : '#ccc'" v-if="item.aprover_type == 'end'">
                         <p class="timeline-title">{{$L('结束')}}</p>
                         <div class="timeline-body">
                             <Avatar :src="$A.apiUrl('../images/avatar/default_approval.png')" size="38"/>
                             <div class="approve-process-left">
                                 <p class="approve-process-name">{{$L('系统')}}</p>
-                                <p style="font-size: 12px;"> {{  datas.is_finished ? $L('已结束') : $L('未结束')  }}</p>
+                                <p class="approve-process-desc"> {{  datas.is_finished ? $L('已结束') : $L('未结束')  }}</p>
                             </div>
                         </div>
                     </TimelineItem>
@@ -140,7 +140,7 @@
                                         <p>{{item.nickname}}</p>
                                         <p class="time">{{item.created_at}}</p>
                                     </div>
-                                    <span>{{ getTimeAgo(item.created_at ,2) }}</span>
+                                    <span>{{ getTimeAgo(item.created_at) }}</span>
                                 </div>
                                 <div class="content">
                                     {{ getContent(item.content) }}
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index 65cfb9d54..e8f5048af 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -506,10 +506,6 @@ export default {
                 skipAuthError: true
             }).then(({data}) => {
                 this.addData.department_id = data[0]?.department[0] || 0;
-                if( !this.addData.department_id ){
-                    $A.modalError("您当前未加入任何部门，不能发起！");
-                    return false;
-                }
                 this.$store.dispatch("call", {
                     url: 'approve/procdef/all',
                     method: 'post',
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index 47b4f6326..eb5861aa0 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -228,6 +228,9 @@
             .approve-process-left {
                 margin-left: 10px;
                 flex: 1;
+                .approve-process-desc{
+                    font-size: 12px;
+                }
             }
 
             .approve-process-right {
@@ -237,6 +240,13 @@
             > li:last-child {
                 padding-bottom: 0;
             }
+
+            .finish{
+                .ivu-timeline-item-content{
+                    padding-bottom: 0;
+                }
+
+            }
         }
 
 
@@ -266,6 +276,10 @@
                 margin-top: 3px;
                 padding-left: 45px;
             }
+
+            .ivu-list-items>li:last-child{
+                padding-bottom: 0;
+            }
         }
 
         .approve-details-text:nth-last-child(1) {
@@ -316,7 +330,7 @@
     .comment {
         margin-top: 5px;
         margin-left: 45px;
-
+        font-size: 12px;
         span {
             background-color: #eaeaea;
             border-radius: 5px;
diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php
index fa7cba481..6ed822534 100755
--- a/resources/views/push/bot.blade.php
+++ b/resources/views/push/bot.blade.php
@@ -150,11 +150,11 @@
     <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
         <b>评论内容</b>
         <span>{{$data->comment_content}}</span>
-    </div><div class="btn-raw">
+    </div><div class="btn-raw no-dark-content">
         @if ($is_finished == 1)
-        <Button type="button" class="ivu-btn" style="flex: 1;">已同意</Button>
+        <Button class="ivu-btn">已同意</Button>
         @else
-        <Button type="button" class="ivu-btn" style="flex: 1;">查看详情</Button>
+        <Button class="ivu-btn">查看详情</Button>
         @endif
     </div></span>
 @elseif ($type === 'approve_submitter')

From ffb05d5aabbc11fe523b88153abfa3bc4760655a Mon Sep 17 00:00:00 2001
From: ganzizi <zhicheng123@126.com>
Date: Fri, 28 Jul 2023 09:13:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 18155b8e2..2fdcb9718 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -747,8 +747,7 @@ class UsersController extends AbstractController
             $builder->whereNull('disable_at');
             $builder->where('bot', 0);
         }
-        $builder = $keys['department'] == '0' ? $builder->orderByDesc('userid') : $builder;
-        $list = $builder->paginate(Base::getPaginate(50, 20));
+        $list = $builder->orderByDesc('userid')->paginate(Base::getPaginate(50, 20));
         //
         if ($getCheckinMac) {
             $list->transform(function (User $user) use ($getCheckinMac) {