1

.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/user/view/user_feedback/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/user_feedback/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/controller/UserFeedback.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/UserFeedback.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -221,7 +221,7 @@
       <workItem from="1665189429149" duration="5358000" />
       <workItem from="1665206979508" duration="7749000" />
       <workItem from="1665276346161" duration="19728000" />
-      <workItem from="1665362529961" duration="10852000" />
+      <workItem from="1665362529961" duration="10920000" />
     </task>
     <servers />
   </component>

application/user/controller/UserFeedback.php

@@ -73,7 +73,10 @@ class UserFeedback extends Controller
         $info = \app\common\model\UserFeedback::where('id',$data['id'])->find()->toArray();
         UserMessage:: sendUserMessage($info['user_id'],'feedback',1,0,0,$data['id']);
         if($data['status'] == 1 && $info['status'] != $data['status']) $data['dispose_time'] = date('Y-m-d H:i:s');
-        if($data['status'] == 2 && $info['status'] != $data['status']) $data['over_time'] = date('Y-m-d H:i:s');
+        if($data['status'] == 2 && $info['status'] != $data['status']) {
+            if(!$data['dispose_time']) $data['dispose_time'] = date('Y-m-d H:i:s');
+            $data['over_time'] = date('Y-m-d H:i:s');
+        }
     }
 
 }