cqpCow 1 year ago
parent
commit
6d16852102
2 changed files with 2 additions and 8 deletions
  1. 2 5
      .idea/workspace.xml
  2. 0 3
      app/Service/EmployeeService.php

+ 2 - 5
.idea/workspace.xml

@@ -3,10 +3,7 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="">
     <list default="true" id="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Model/Depart.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Model/Depart.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Model/Employee.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Model/Employee.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/MaterialService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/MaterialService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Service/EmployeeService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/EmployeeService.php" afterDir="false" />
     </list>
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -149,7 +146,7 @@
       <workItem from="1685595177391" duration="2533000" />
       <workItem from="1685595177391" duration="2533000" />
       <workItem from="1685669123669" duration="2439000" />
       <workItem from="1685669123669" duration="2439000" />
       <workItem from="1685952381761" duration="726000" />
       <workItem from="1685952381761" duration="726000" />
-      <workItem from="1686021203384" duration="5682000" />
+      <workItem from="1686021203384" duration="6377000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>

+ 0 - 3
app/Service/EmployeeService.php

@@ -245,9 +245,6 @@ class EmployeeService extends Service
     }
     }
 
 
     public function teamAdd($data,$user){
     public function teamAdd($data,$user){
-
-
-//        if($this->isEmpty($data,'title')) return [201,'名称不存在!'];
         list($status,$msg) = $this->teamRule($data);
         list($status,$msg) = $this->teamRule($data);
         if(!$status) return [$status,$msg];
         if(!$status) return [$status,$msg];
         $first = Team::where('title',$data['title'])->where('del_time',0)->first();
         $first = Team::where('title',$data['title'])->where('del_time',0)->first();