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/api/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Login.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Task.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Task.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -207,6 +207,8 @@
       <workItem from="1670807412269" duration="9728000" />
       <workItem from="1671065604459" duration="7662000" />
       <workItem from="1671152221434" duration="19086000" />
+      <workItem from="1672793409629" duration="408000" />
+      <workItem from="1672793834653" duration="682000" />
     </task>
     <servers />
   </component>
@@ -356,19 +358,19 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="793" y="524" key="VcsDiffUtil.ChangesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1667975468009" />
-    <state x="533" y="290" key="com.intellij.ide.util.TipDialog" timestamp="1670807432611">
+    <state x="533" y="290" key="com.intellij.ide.util.TipDialog" timestamp="1672793838147">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="533" y="290" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670807432611" />
-    <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1671416367052">
+    <state x="533" y="290" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1672793838147" />
+    <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1672714043286">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
-    <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1671416367052" />
-    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1672710372756">
+    <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1672714043286" />
+    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1672794413065">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1672710372756" />
+    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1672794413065" />
     <state x="1291" y="317" key="run.anything.popup" timestamp="1668056889671">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/Task.php

@@ -50,12 +50,14 @@ class Task extends Base
                     $res =  Jpush($user_info['id'],$v['content']);
                 }
             }else{
+                if(!$v['label']) continue;
                 $label_arr = explode(',',$v['label']);
                 $where_str = '';
+                $search_arr=[];
                 foreach ($label_arr as $t){
                     $search_arr[] =  " title like '".'%'.$t."%'" .' ';
                 }
-                if($where_str == '') continue;
+                if(!empty($search_arr)) $where_str  =  implode(' OR ',$search_arr);
                 $user_arr = UserSearch::where($where_str)->column('user_id');
                 foreach (array_unique($user_arr) as $user_id) {
                     $res =  Jpush($user_id,$v['content']);