郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 fc5523ad99d534476eb8678b347a4f02d3f4ae07 1 个父辈 1db0e3b8
1 个管道 的构建 通过 耗费 3 秒

修改搜索关键词

内嵌 并排对比
正在显示 3 个修改的文件 包含 156 行增加 和 147 行删除
... ... @@ -7,7 +7,6 @@
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -21,8 +20,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="321" column="35" lean-forward="true" selection-start-line="321" selection-start-column="35" selection-end-line="321" selection-end-column="35" />
<state relative-caret-position="310">
<caret line="319" column="26" lean-forward="true" selection-start-line="319" selection-start-column="26" selection-end-line="319" selection-end-column="26" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -36,73 +35,74 @@
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#8426#8859#0#PHP" expanded="false" />
<element signature="e#8922#9331#0#PHP" expanded="false" />
<element signature="e#9395#9665#0#PHP" expanded="false" />
<element signature="e#10685#11365#0#PHP" expanded="false" />
<element signature="e#11370#12228#0#PHP" expanded="false" />
<element signature="e#12234#13023#0#PHP" expanded="false" />
<element signature="e#13028#14377#0#PHP" expanded="false" />
<element signature="e#14383#15085#0#PHP" expanded="false" />
<element signature="e#15090#16410#0#PHP" expanded="false" />
<element signature="e#16416#16992#0#PHP" expanded="false" />
<element signature="e#16997#17609#0#PHP" expanded="false" />
<element signature="e#17615#18331#0#PHP" expanded="false" />
<element signature="e#18336#22463#0#PHP" expanded="false" />
<element signature="e#22469#23399#0#PHP" expanded="false" />
<element signature="e#23404#28545#0#PHP" expanded="false" />
<element signature="e#28551#28928#0#PHP" expanded="false" />
<element signature="e#28933#29372#0#PHP" expanded="false" />
<element signature="e#29378#30199#0#PHP" expanded="false" />
<element signature="e#30204#33608#0#PHP" expanded="false" />
<element signature="e#30650#33602#0#PHP" expanded="false" />
<element signature="e#33614#34119#0#PHP" expanded="false" />
<element signature="e#34124#34375#0#PHP" expanded="false" />
<element signature="e#34381#34860#0#PHP" expanded="false" />
<element signature="e#34865#35622#0#PHP" expanded="false" />
<element signature="e#35628#36109#0#PHP" expanded="false" />
<element signature="e#36114#36884#0#PHP" expanded="false" />
<element signature="e#36890#37253#0#PHP" expanded="false" />
<element signature="e#37258#37449#0#PHP" expanded="false" />
<element signature="e#37455#37813#0#PHP" expanded="false" />
<element signature="e#37818#38009#0#PHP" expanded="false" />
<element signature="e#38015#39158#0#PHP" expanded="false" />
<element signature="e#39163#41828#0#PHP" expanded="false" />
<element signature="e#41834#42332#0#PHP" expanded="false" />
<element signature="e#42337#44083#0#PHP" expanded="false" />
<element signature="e#44089#44502#0#PHP" expanded="false" />
<element signature="e#44507#44986#0#PHP" expanded="false" />
<element signature="e#44992#45526#0#PHP" expanded="false" />
<element signature="e#45531#46916#0#PHP" expanded="false" />
<element signature="e#46922#47576#0#PHP" expanded="false" />
<element signature="e#47581#49596#0#PHP" expanded="false" />
<element signature="e#49602#50362#0#PHP" expanded="false" />
<element signature="e#50367#53076#0#PHP" expanded="false" />
<element signature="e#53102#53933#0#PHP" expanded="false" />
<element signature="e#53939#54359#0#PHP" expanded="false" />
<element signature="e#54364#54847#0#PHP" expanded="false" />
<element signature="e#54853#55659#0#PHP" expanded="false" />
<element signature="e#55664#58822#0#PHP" expanded="false" />
<element signature="e#57457#58816#0#PHP" expanded="false" />
<element signature="e#58837#60172#0#PHP" expanded="false" />
<element signature="e#58953#59355#0#PHP" expanded="false" />
<element signature="e#60188#61222#0#PHP" expanded="false" />
<element signature="e#61228#61986#0#PHP" expanded="false" />
<element signature="e#61991#65734#0#PHP" expanded="false" />
<element signature="e#65740#66132#0#PHP" expanded="false" />
<element signature="e#66137#67089#0#PHP" expanded="false" />
<element signature="e#67113#67686#0#PHP" expanded="false" />
<element signature="e#67692#68291#0#PHP" expanded="false" />
<element signature="e#68296#69223#0#PHP" expanded="false" />
<element signature="e#69229#69943#0#PHP" expanded="false" />
<element signature="e#69949#70376#0#PHP" expanded="false" />
<element signature="e#70381#70850#0#PHP" expanded="false" />
<element signature="e#70857#72062#0#PHP" expanded="false" />
<element signature="e#72067#73770#0#PHP" expanded="false" />
<element signature="e#73776#74553#0#PHP" expanded="false" />
<element signature="e#74558#78496#0#PHP" expanded="false" />
<element signature="e#78502#79011#0#PHP" expanded="false" />
<element signature="e#79016#79688#0#PHP" expanded="false" />
<element signature="e#9469#9878#0#PHP" expanded="false" />
<element signature="e#9942#10212#0#PHP" expanded="false" />
<element signature="e#10222#11220#0#PHP" expanded="false" />
<element signature="e#10734#11220#0#PHP" expanded="false" />
<element signature="e#11232#11912#0#PHP" expanded="false" />
<element signature="e#11917#12775#0#PHP" expanded="false" />
<element signature="e#12781#13570#0#PHP" expanded="false" />
<element signature="e#13575#14924#0#PHP" expanded="false" />
<element signature="e#14930#15632#0#PHP" expanded="false" />
<element signature="e#15637#16957#0#PHP" expanded="false" />
<element signature="e#16963#17539#0#PHP" expanded="false" />
<element signature="e#17544#18156#0#PHP" expanded="false" />
<element signature="e#18162#18878#0#PHP" expanded="false" />
<element signature="e#18883#23010#0#PHP" expanded="false" />
<element signature="e#23016#23946#0#PHP" expanded="false" />
<element signature="e#23951#29092#0#PHP" expanded="false" />
<element signature="e#29098#29475#0#PHP" expanded="false" />
<element signature="e#29480#29919#0#PHP" expanded="false" />
<element signature="e#29925#30746#0#PHP" expanded="false" />
<element signature="e#30751#34155#0#PHP" expanded="false" />
<element signature="e#31197#34149#0#PHP" expanded="false" />
<element signature="e#34161#34666#0#PHP" expanded="false" />
<element signature="e#34671#34922#0#PHP" expanded="false" />
<element signature="e#34928#35407#0#PHP" expanded="false" />
<element signature="e#35412#36169#0#PHP" expanded="false" />
<element signature="e#36175#36656#0#PHP" expanded="false" />
<element signature="e#36661#37431#0#PHP" expanded="false" />
<element signature="e#37437#37800#0#PHP" expanded="false" />
<element signature="e#37805#37996#0#PHP" expanded="false" />
<element signature="e#38002#38360#0#PHP" expanded="false" />
<element signature="e#38365#38556#0#PHP" expanded="false" />
<element signature="e#38562#39705#0#PHP" expanded="false" />
<element signature="e#39710#42375#0#PHP" expanded="false" />
<element signature="e#42381#42879#0#PHP" expanded="false" />
<element signature="e#42884#44630#0#PHP" expanded="false" />
<element signature="e#44636#45049#0#PHP" expanded="false" />
<element signature="e#45054#45533#0#PHP" expanded="false" />
<element signature="e#45539#46073#0#PHP" expanded="false" />
<element signature="e#46078#47463#0#PHP" expanded="false" />
<element signature="e#47469#48123#0#PHP" expanded="false" />
<element signature="e#48128#50143#0#PHP" expanded="false" />
<element signature="e#50149#50909#0#PHP" expanded="false" />
<element signature="e#50914#53623#0#PHP" expanded="false" />
<element signature="e#53649#54480#0#PHP" expanded="false" />
<element signature="e#54486#54906#0#PHP" expanded="false" />
<element signature="e#54911#55394#0#PHP" expanded="false" />
<element signature="e#55400#56206#0#PHP" expanded="false" />
<element signature="e#56211#59369#0#PHP" expanded="false" />
<element signature="e#58004#59363#0#PHP" expanded="false" />
<element signature="e#59384#60719#0#PHP" expanded="false" />
<element signature="e#59500#59902#0#PHP" expanded="false" />
<element signature="e#60735#61769#0#PHP" expanded="false" />
<element signature="e#61775#62533#0#PHP" expanded="false" />
<element signature="e#62538#66281#0#PHP" expanded="false" />
<element signature="e#66287#66679#0#PHP" expanded="false" />
<element signature="e#66684#67636#0#PHP" expanded="false" />
<element signature="e#67660#68233#0#PHP" expanded="false" />
<element signature="e#68239#68838#0#PHP" expanded="false" />
<element signature="e#68843#69770#0#PHP" expanded="false" />
<element signature="e#69776#70490#0#PHP" expanded="false" />
<element signature="e#70496#70923#0#PHP" expanded="false" />
<element signature="e#70928#71397#0#PHP" expanded="false" />
<element signature="e#71404#72609#0#PHP" expanded="false" />
<element signature="e#72614#74317#0#PHP" expanded="false" />
<element signature="e#74323#75100#0#PHP" expanded="false" />
<element signature="e#75105#79043#0#PHP" expanded="false" />
<element signature="e#79049#79558#0#PHP" expanded="false" />
<element signature="e#79563#80235#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -210,7 +210,7 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="515" />
<option name="x" value="442" />
<option name="y" value="67" />
<option name="width" value="1652" />
<option name="height" value="942" />
... ... @@ -407,7 +407,7 @@
<workItem from="1584687351301" duration="330000" />
<workItem from="1584758035473" duration="1782000" />
<workItem from="1584775386700" duration="6222000" />
<workItem from="1584794340552" duration="3018000" />
<workItem from="1584794340552" duration="3923000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -434,7 +434,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="634246000" />
<option name="totallyTimeSpent" value="635151000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -446,8 +446,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="515" y="67" width="1652" height="942" extended-state="0" />
<editor active="true" />
<frame x="442" y="67" width="1652" height="942" extended-state="0" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15703517" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -456,7 +455,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46708074" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46708074" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -881,8 +880,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="321" column="35" lean-forward="true" selection-start-line="321" selection-start-column="35" selection-end-line="321" selection-end-column="35" />
<state relative-caret-position="310">
<caret line="319" column="26" lean-forward="true" selection-start-line="319" selection-start-column="26" selection-end-line="319" selection-end-column="26" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -896,73 +895,74 @@
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#8426#8859#0#PHP" expanded="false" />
<element signature="e#8922#9331#0#PHP" expanded="false" />
<element signature="e#9395#9665#0#PHP" expanded="false" />
<element signature="e#10685#11365#0#PHP" expanded="false" />
<element signature="e#11370#12228#0#PHP" expanded="false" />
<element signature="e#12234#13023#0#PHP" expanded="false" />
<element signature="e#13028#14377#0#PHP" expanded="false" />
<element signature="e#14383#15085#0#PHP" expanded="false" />
<element signature="e#15090#16410#0#PHP" expanded="false" />
<element signature="e#16416#16992#0#PHP" expanded="false" />
<element signature="e#16997#17609#0#PHP" expanded="false" />
<element signature="e#17615#18331#0#PHP" expanded="false" />
<element signature="e#18336#22463#0#PHP" expanded="false" />
<element signature="e#22469#23399#0#PHP" expanded="false" />
<element signature="e#23404#28545#0#PHP" expanded="false" />
<element signature="e#28551#28928#0#PHP" expanded="false" />
<element signature="e#28933#29372#0#PHP" expanded="false" />
<element signature="e#29378#30199#0#PHP" expanded="false" />
<element signature="e#30204#33608#0#PHP" expanded="false" />
<element signature="e#30650#33602#0#PHP" expanded="false" />
<element signature="e#33614#34119#0#PHP" expanded="false" />
<element signature="e#34124#34375#0#PHP" expanded="false" />
<element signature="e#34381#34860#0#PHP" expanded="false" />
<element signature="e#34865#35622#0#PHP" expanded="false" />
<element signature="e#35628#36109#0#PHP" expanded="false" />
<element signature="e#36114#36884#0#PHP" expanded="false" />
<element signature="e#36890#37253#0#PHP" expanded="false" />
<element signature="e#37258#37449#0#PHP" expanded="false" />
<element signature="e#37455#37813#0#PHP" expanded="false" />
<element signature="e#37818#38009#0#PHP" expanded="false" />
<element signature="e#38015#39158#0#PHP" expanded="false" />
<element signature="e#39163#41828#0#PHP" expanded="false" />
<element signature="e#41834#42332#0#PHP" expanded="false" />
<element signature="e#42337#44083#0#PHP" expanded="false" />
<element signature="e#44089#44502#0#PHP" expanded="false" />
<element signature="e#44507#44986#0#PHP" expanded="false" />
<element signature="e#44992#45526#0#PHP" expanded="false" />
<element signature="e#45531#46916#0#PHP" expanded="false" />
<element signature="e#46922#47576#0#PHP" expanded="false" />
<element signature="e#47581#49596#0#PHP" expanded="false" />
<element signature="e#49602#50362#0#PHP" expanded="false" />
<element signature="e#50367#53076#0#PHP" expanded="false" />
<element signature="e#53102#53933#0#PHP" expanded="false" />
<element signature="e#53939#54359#0#PHP" expanded="false" />
<element signature="e#54364#54847#0#PHP" expanded="false" />
<element signature="e#54853#55659#0#PHP" expanded="false" />
<element signature="e#55664#58822#0#PHP" expanded="false" />
<element signature="e#57457#58816#0#PHP" expanded="false" />
<element signature="e#58837#60172#0#PHP" expanded="false" />
<element signature="e#58953#59355#0#PHP" expanded="false" />
<element signature="e#60188#61222#0#PHP" expanded="false" />
<element signature="e#61228#61986#0#PHP" expanded="false" />
<element signature="e#61991#65734#0#PHP" expanded="false" />
<element signature="e#65740#66132#0#PHP" expanded="false" />
<element signature="e#66137#67089#0#PHP" expanded="false" />
<element signature="e#67113#67686#0#PHP" expanded="false" />
<element signature="e#67692#68291#0#PHP" expanded="false" />
<element signature="e#68296#69223#0#PHP" expanded="false" />
<element signature="e#69229#69943#0#PHP" expanded="false" />
<element signature="e#69949#70376#0#PHP" expanded="false" />
<element signature="e#70381#70850#0#PHP" expanded="false" />
<element signature="e#70857#72062#0#PHP" expanded="false" />
<element signature="e#72067#73770#0#PHP" expanded="false" />
<element signature="e#73776#74553#0#PHP" expanded="false" />
<element signature="e#74558#78496#0#PHP" expanded="false" />
<element signature="e#78502#79011#0#PHP" expanded="false" />
<element signature="e#79016#79688#0#PHP" expanded="false" />
<element signature="e#9469#9878#0#PHP" expanded="false" />
<element signature="e#9942#10212#0#PHP" expanded="false" />
<element signature="e#10222#11220#0#PHP" expanded="false" />
<element signature="e#10734#11220#0#PHP" expanded="false" />
<element signature="e#11232#11912#0#PHP" expanded="false" />
<element signature="e#11917#12775#0#PHP" expanded="false" />
<element signature="e#12781#13570#0#PHP" expanded="false" />
<element signature="e#13575#14924#0#PHP" expanded="false" />
<element signature="e#14930#15632#0#PHP" expanded="false" />
<element signature="e#15637#16957#0#PHP" expanded="false" />
<element signature="e#16963#17539#0#PHP" expanded="false" />
<element signature="e#17544#18156#0#PHP" expanded="false" />
<element signature="e#18162#18878#0#PHP" expanded="false" />
<element signature="e#18883#23010#0#PHP" expanded="false" />
<element signature="e#23016#23946#0#PHP" expanded="false" />
<element signature="e#23951#29092#0#PHP" expanded="false" />
<element signature="e#29098#29475#0#PHP" expanded="false" />
<element signature="e#29480#29919#0#PHP" expanded="false" />
<element signature="e#29925#30746#0#PHP" expanded="false" />
<element signature="e#30751#34155#0#PHP" expanded="false" />
<element signature="e#31197#34149#0#PHP" expanded="false" />
<element signature="e#34161#34666#0#PHP" expanded="false" />
<element signature="e#34671#34922#0#PHP" expanded="false" />
<element signature="e#34928#35407#0#PHP" expanded="false" />
<element signature="e#35412#36169#0#PHP" expanded="false" />
<element signature="e#36175#36656#0#PHP" expanded="false" />
<element signature="e#36661#37431#0#PHP" expanded="false" />
<element signature="e#37437#37800#0#PHP" expanded="false" />
<element signature="e#37805#37996#0#PHP" expanded="false" />
<element signature="e#38002#38360#0#PHP" expanded="false" />
<element signature="e#38365#38556#0#PHP" expanded="false" />
<element signature="e#38562#39705#0#PHP" expanded="false" />
<element signature="e#39710#42375#0#PHP" expanded="false" />
<element signature="e#42381#42879#0#PHP" expanded="false" />
<element signature="e#42884#44630#0#PHP" expanded="false" />
<element signature="e#44636#45049#0#PHP" expanded="false" />
<element signature="e#45054#45533#0#PHP" expanded="false" />
<element signature="e#45539#46073#0#PHP" expanded="false" />
<element signature="e#46078#47463#0#PHP" expanded="false" />
<element signature="e#47469#48123#0#PHP" expanded="false" />
<element signature="e#48128#50143#0#PHP" expanded="false" />
<element signature="e#50149#50909#0#PHP" expanded="false" />
<element signature="e#50914#53623#0#PHP" expanded="false" />
<element signature="e#53649#54480#0#PHP" expanded="false" />
<element signature="e#54486#54906#0#PHP" expanded="false" />
<element signature="e#54911#55394#0#PHP" expanded="false" />
<element signature="e#55400#56206#0#PHP" expanded="false" />
<element signature="e#56211#59369#0#PHP" expanded="false" />
<element signature="e#58004#59363#0#PHP" expanded="false" />
<element signature="e#59384#60719#0#PHP" expanded="false" />
<element signature="e#59500#59902#0#PHP" expanded="false" />
<element signature="e#60735#61769#0#PHP" expanded="false" />
<element signature="e#61775#62533#0#PHP" expanded="false" />
<element signature="e#62538#66281#0#PHP" expanded="false" />
<element signature="e#66287#66679#0#PHP" expanded="false" />
<element signature="e#66684#67636#0#PHP" expanded="false" />
<element signature="e#67660#68233#0#PHP" expanded="false" />
<element signature="e#68239#68838#0#PHP" expanded="false" />
<element signature="e#68843#69770#0#PHP" expanded="false" />
<element signature="e#69776#70490#0#PHP" expanded="false" />
<element signature="e#70496#70923#0#PHP" expanded="false" />
<element signature="e#70928#71397#0#PHP" expanded="false" />
<element signature="e#71404#72609#0#PHP" expanded="false" />
<element signature="e#72614#74317#0#PHP" expanded="false" />
<element signature="e#74323#75100#0#PHP" expanded="false" />
<element signature="e#75105#79043#0#PHP" expanded="false" />
<element signature="e#79049#79558#0#PHP" expanded="false" />
<element signature="e#79563#80235#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -279,7 +279,16 @@ class User extends Api
$shu = explode(' ',$param['keyword']);
$where_shu = function ($query_shu) use ($shu) {
foreach ($shu as $v){
$query_shu->where('keyword','like','%'.$v.'%');
$a = Db::name('words')->where('name',$v)->field('id,type')->find();
if(!empty($a)){
if($a['type'] == 1){
$query_shu->where('keyword','like','%'.$v.'%')->whereor('address_ids','like','%,'.$a['id'].',%');
}elseif($a['type'] == 2){
$query_shu->where('keyword','like','%'.$v.'%')->whereor('text_ids','like','%,'.$a['id'].',%');
}
}else{
$query_shu->where('keyword','like','%'.$v.'%');
}
}
};
}
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-21 21:29:01 </div>
Generated on 2020-03-21 21:44:22 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...