登录处理

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/user/controller/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/LoginController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/admin/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/CommentController.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -72,7 +72,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="321">
@@ -81,6 +81,15 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="357">
+              <caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -165,6 +174,7 @@
         <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
         <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
         <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
+        <option value="$PROJECT_DIR$/app/admin/controller/CommentController.php" />
       </list>
     </option>
   </component>
@@ -223,13 +233,13 @@
               <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
               <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="user" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
               <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="user" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -338,14 +348,7 @@
       <workItem from="1535514127808" duration="727000" />
       <workItem from="1535532970259" duration="2527000" />
       <workItem from="1535546044129" duration="20814000" />
-      <workItem from="1535633001243" duration="13155000" />
-    </task>
-    <task id="LOCAL-00009" summary="已评价无数据情况">
-      <created>1535465324978</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1535465324978</updated>
+      <workItem from="1535633001243" duration="13825000" />
     </task>
     <task id="LOCAL-00010" summary="已评价无数据情况">
       <created>1535465766116</created>
@@ -683,17 +686,24 @@
       <option name="project" value="LOCAL" />
       <updated>1535649911425</updated>
     </task>
-    <option name="localTasksCounter" value="58" />
+    <task id="LOCAL-00058" summary="登录处理">
+      <created>1535650097321</created>
+      <option name="number" value="00058" />
+      <option name="presentableId" value="LOCAL-00058" />
+      <option name="project" value="LOCAL" />
+      <updated>1535650097321</updated>
+    </task>
+    <option name="localTasksCounter" value="59" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="67607000" />
+    <option name="totallyTimeSpent" value="68277000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.14658849" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -756,13 +766,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="登录处理" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/api/user/route.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
@@ -1080,5 +1083,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file

@@ -133,7 +133,7 @@ class CommentController extends AdminBaseController
         if (!empty($mobile)) {
             $where['mobile'] = $mobile;
         }
-        $where['delete_time'] = 0;
+        $where['c.delete_time'] = 0;
         $list = DB::name($this->table_name)
             ->alias('c')
             ->join('qnb_user u','u.id=c.teach_id')
@@ -175,7 +175,7 @@ class CommentController extends AdminBaseController
             ->alias('c')
             ->join('qnb_user u','u.id=c.uid')
             ->field('c.*')
-            ->where(['delete_time'=>0])
+            ->where(['c.delete_time'=>0])
             ->paginate(15);
 
         $this->assign("list", $list->items());