wupengfei пре 1 година
родитељ
комит
2315e74152
2 измењених фајлова са 5 додато и 4 уклоњено
  1. 2 2
      .idea/workspace.xml
  2. 3 2
      application/api/controller/Activity.php

+ 2 - 2
.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -376,7 +376,7 @@
       <workItem from="1689641487273" duration="19876000" />
       <workItem from="1689728218007" duration="5405000" />
       <workItem from="1689813742376" duration="13449000" />
-      <workItem from="1689900489647" duration="3416000" />
+      <workItem from="1689900489647" duration="4251000" />
     </task>
     <servers />
   </component>

+ 3 - 2
application/api/controller/Activity.php

@@ -962,8 +962,9 @@ class Activity extends Base
     {
         $order_num = 0;
         $apply_num = 0;
-        $message_num = 0;
-        $this->success('ok',compact(['order_num','apply_num','message_num']));
+        $message_num = UserMessage::where(['m.user_id'=>$this->user_id,'m.is_deleted'=>0,'m.module'=>'activity'])->alias('m')->count();
+        $total_num = $message_num;
+        $this->success('ok',compact(['order_num','apply_num','message_num','total_num']));
     }
 
     /**