正在显示
2 个修改的文件
包含
34 行增加
和
24 行删除
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> | 4 | <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> |
5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
6 | - <change beforePath="$PROJECT_DIR$/app/user/controller/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/LoginController.php" afterDir="false" /> | 6 | + <change beforePath="$PROJECT_DIR$/app/admin/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/CommentController.php" afterDir="false" /> |
7 | </list> | 7 | </list> |
8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
9 | <option name="TRACKING_ENABLED" value="true" /> | 9 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
72 | </provider> | 72 | </provider> |
73 | </entry> | 73 | </entry> |
74 | </file> | 74 | </file> |
75 | - <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true"> | 75 | + <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false"> |
76 | <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php"> | 76 | <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php"> |
77 | <provider selected="true" editor-type-id="text-editor"> | 77 | <provider selected="true" editor-type-id="text-editor"> |
78 | <state relative-caret-position="321"> | 78 | <state relative-caret-position="321"> |
@@ -81,6 +81,15 @@ | @@ -81,6 +81,15 @@ | ||
81 | </provider> | 81 | </provider> |
82 | </entry> | 82 | </entry> |
83 | </file> | 83 | </file> |
84 | + <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true"> | ||
85 | + <entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php"> | ||
86 | + <provider selected="true" editor-type-id="text-editor"> | ||
87 | + <state relative-caret-position="357"> | ||
88 | + <caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" /> | ||
89 | + </state> | ||
90 | + </provider> | ||
91 | + </entry> | ||
92 | + </file> | ||
84 | <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false"> | 93 | <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false"> |
85 | <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php"> | 94 | <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php"> |
86 | <provider selected="true" editor-type-id="text-editor"> | 95 | <provider selected="true" editor-type-id="text-editor"> |
@@ -165,6 +174,7 @@ | @@ -165,6 +174,7 @@ | ||
165 | <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" /> | 174 | <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" /> |
166 | <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" /> | 175 | <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" /> |
167 | <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" /> | 176 | <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" /> |
177 | + <option value="$PROJECT_DIR$/app/admin/controller/CommentController.php" /> | ||
168 | </list> | 178 | </list> |
169 | </option> | 179 | </option> |
170 | </component> | 180 | </component> |
@@ -223,13 +233,13 @@ | @@ -223,13 +233,13 @@ | ||
223 | <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> | 233 | <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> |
224 | <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> | 234 | <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> |
225 | <item name="app" type="462c0819:PsiDirectoryNode" /> | 235 | <item name="app" type="462c0819:PsiDirectoryNode" /> |
226 | - <item name="user" type="462c0819:PsiDirectoryNode" /> | 236 | + <item name="admin" type="462c0819:PsiDirectoryNode" /> |
227 | </path> | 237 | </path> |
228 | <path> | 238 | <path> |
229 | <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> | 239 | <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> |
230 | <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> | 240 | <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> |
231 | <item name="app" type="462c0819:PsiDirectoryNode" /> | 241 | <item name="app" type="462c0819:PsiDirectoryNode" /> |
232 | - <item name="user" type="462c0819:PsiDirectoryNode" /> | 242 | + <item name="admin" type="462c0819:PsiDirectoryNode" /> |
233 | <item name="controller" type="462c0819:PsiDirectoryNode" /> | 243 | <item name="controller" type="462c0819:PsiDirectoryNode" /> |
234 | </path> | 244 | </path> |
235 | <path> | 245 | <path> |
@@ -338,14 +348,7 @@ | @@ -338,14 +348,7 @@ | ||
338 | <workItem from="1535514127808" duration="727000" /> | 348 | <workItem from="1535514127808" duration="727000" /> |
339 | <workItem from="1535532970259" duration="2527000" /> | 349 | <workItem from="1535532970259" duration="2527000" /> |
340 | <workItem from="1535546044129" duration="20814000" /> | 350 | <workItem from="1535546044129" duration="20814000" /> |
341 | - <workItem from="1535633001243" duration="13155000" /> | ||
342 | - </task> | ||
343 | - <task id="LOCAL-00009" summary="已评价无数据情况"> | ||
344 | - <created>1535465324978</created> | ||
345 | - <option name="number" value="00009" /> | ||
346 | - <option name="presentableId" value="LOCAL-00009" /> | ||
347 | - <option name="project" value="LOCAL" /> | ||
348 | - <updated>1535465324978</updated> | 351 | + <workItem from="1535633001243" duration="13825000" /> |
349 | </task> | 352 | </task> |
350 | <task id="LOCAL-00010" summary="已评价无数据情况"> | 353 | <task id="LOCAL-00010" summary="已评价无数据情况"> |
351 | <created>1535465766116</created> | 354 | <created>1535465766116</created> |
@@ -683,17 +686,24 @@ | @@ -683,17 +686,24 @@ | ||
683 | <option name="project" value="LOCAL" /> | 686 | <option name="project" value="LOCAL" /> |
684 | <updated>1535649911425</updated> | 687 | <updated>1535649911425</updated> |
685 | </task> | 688 | </task> |
686 | - <option name="localTasksCounter" value="58" /> | 689 | + <task id="LOCAL-00058" summary="登录处理"> |
690 | + <created>1535650097321</created> | ||
691 | + <option name="number" value="00058" /> | ||
692 | + <option name="presentableId" value="LOCAL-00058" /> | ||
693 | + <option name="project" value="LOCAL" /> | ||
694 | + <updated>1535650097321</updated> | ||
695 | + </task> | ||
696 | + <option name="localTasksCounter" value="59" /> | ||
687 | <servers /> | 697 | <servers /> |
688 | </component> | 698 | </component> |
689 | <component name="TimeTrackingManager"> | 699 | <component name="TimeTrackingManager"> |
690 | - <option name="totallyTimeSpent" value="67607000" /> | 700 | + <option name="totallyTimeSpent" value="68277000" /> |
691 | </component> | 701 | </component> |
692 | <component name="ToolWindowManager"> | 702 | <component name="ToolWindowManager"> |
693 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 703 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
694 | <editor active="true" /> | 704 | <editor active="true" /> |
695 | <layout> | 705 | <layout> |
696 | - <window_info content_ui="combo" id="Project" order="0" weight="0.14658849" /> | 706 | + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" /> |
697 | <window_info anchor="bottom" id="TODO" order="6" /> | 707 | <window_info anchor="bottom" id="TODO" order="6" /> |
698 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | 708 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> |
699 | <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> | 709 | <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> |
@@ -756,13 +766,6 @@ | @@ -756,13 +766,6 @@ | ||
756 | <option name="LAST_COMMIT_MESSAGE" value="登录处理" /> | 766 | <option name="LAST_COMMIT_MESSAGE" value="登录处理" /> |
757 | </component> | 767 | </component> |
758 | <component name="editorHistoryManager"> | 768 | <component name="editorHistoryManager"> |
759 | - <entry file="file://$PROJECT_DIR$/api/user/route.php"> | ||
760 | - <provider selected="true" editor-type-id="text-editor"> | ||
761 | - <state relative-caret-position="105"> | ||
762 | - <caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="22" /> | ||
763 | - </state> | ||
764 | - </provider> | ||
765 | - </entry> | ||
766 | <entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php"> | 769 | <entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php"> |
767 | <provider selected="true" editor-type-id="text-editor"> | 770 | <provider selected="true" editor-type-id="text-editor"> |
768 | <state relative-caret-position="126"> | 771 | <state relative-caret-position="126"> |
@@ -1080,5 +1083,12 @@ | @@ -1080,5 +1083,12 @@ | ||
1080 | </state> | 1083 | </state> |
1081 | </provider> | 1084 | </provider> |
1082 | </entry> | 1085 | </entry> |
1086 | + <entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php"> | ||
1087 | + <provider selected="true" editor-type-id="text-editor"> | ||
1088 | + <state relative-caret-position="357"> | ||
1089 | + <caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" /> | ||
1090 | + </state> | ||
1091 | + </provider> | ||
1092 | + </entry> | ||
1083 | </component> | 1093 | </component> |
1084 | </project> | 1094 | </project> |
@@ -133,7 +133,7 @@ class CommentController extends AdminBaseController | @@ -133,7 +133,7 @@ class CommentController extends AdminBaseController | ||
133 | if (!empty($mobile)) { | 133 | if (!empty($mobile)) { |
134 | $where['mobile'] = $mobile; | 134 | $where['mobile'] = $mobile; |
135 | } | 135 | } |
136 | - $where['delete_time'] = 0; | 136 | + $where['c.delete_time'] = 0; |
137 | $list = DB::name($this->table_name) | 137 | $list = DB::name($this->table_name) |
138 | ->alias('c') | 138 | ->alias('c') |
139 | ->join('qnb_user u','u.id=c.teach_id') | 139 | ->join('qnb_user u','u.id=c.teach_id') |
@@ -175,7 +175,7 @@ class CommentController extends AdminBaseController | @@ -175,7 +175,7 @@ class CommentController extends AdminBaseController | ||
175 | ->alias('c') | 175 | ->alias('c') |
176 | ->join('qnb_user u','u.id=c.uid') | 176 | ->join('qnb_user u','u.id=c.uid') |
177 | ->field('c.*') | 177 | ->field('c.*') |
178 | - ->where(['delete_time'=>0]) | 178 | + ->where(['c.delete_time'=>0]) |
179 | ->paginate(15); | 179 | ->paginate(15); |
180 | 180 | ||
181 | $this->assign("list", $list->items()); | 181 | $this->assign("list", $list->items()); |
-
请 注册 或 登录 后发表评论