update

src/main/java/com/gogirl/application/store/store/StoreTechnicianService.java

@@ -31,4 +31,7 @@ public interface StoreTechnicianService extends IService<StoreTechnician> {
      * @return
      */
     StoreTechnician getTechnician();
+
+
+    List<StoreTechnician> list(StoreTechnician storeTechnician);
 }

src/main/java/com/gogirl/application/store/store/impl/StoreTechnicianServiceImpl.java

@@ -106,4 +106,13 @@ public class StoreTechnicianServiceImpl extends ServiceImpl<StoreTechnicianMappe
         storeTechnician.setDepartmentName(gogirlToken.getDepartmentName());
         return storeTechnician;
     }
+
+    @Override
+    public List<StoreTechnician> list(StoreTechnician storeTechnician) {
+        LambdaQueryWrapper<StoreTechnician> wrapper = new LambdaQueryWrapper<>();
+        if (storeTechnician.getDepartmentId() != null) {
+            wrapper.eq(StoreTechnician::getDepartmentId, storeTechnician.getDepartmentId());
+        }
+        return this.list(wrapper);
+    }
 }

src/main/java/com/gogirl/interfaces/store/technician/StoreTechnicianController.java

@@ -16,11 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
 
 @Api("美甲师接口")
 @RestController
@@ -61,16 +57,11 @@ public class StoreTechnicianController {
 
 
     @ApiOperation(value = "根据店铺查询美甲师")
-    @GetMapping("/customer/user/queryStoreUser")
-    public JsonResult<List<StoreUser>> queryStoreUser(@RequestParam(required = false) Integer departmentId) {
+    @GetMapping("/customer/user/queryStoreTechnician")
+    public JsonResult<List<StoreTechnician>> queryStoreTechnician(StoreTechnician storeTechnician) {
 
-        StoreUser storeUser = new StoreUser();
-        if (departmentId != null) {
-            storeUser.setDepartmentId(departmentId);
-        }
-        List<StoreUser> lists = new ArrayList<>(storeUserService.listUserForAllNotQuit(storeUser)
-                .stream().collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparingInt(StoreUser::getId)))));
-        return JsonResult.success(lists);
+        List<StoreTechnician> storeTechnicianList = storeTechnicianService.list(storeTechnician);
+        return JsonResult.success(storeTechnicianList);
     }
 
     @ApiOperation(value = "美甲师根据code获取token")