用户

src/main/java/com/izouma/jiashanxia/repo/UserRepo.java

@@ -31,4 +31,6 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
     List<User> findAllByCompanyIdAndDelFalse(Long companyId);
 
     long countByParentAndDelFalse(Long parentId);
+
+    List<User> findAllByCompanyIdIsNullAndDelFalse();
 }

src/main/java/com/izouma/jiashanxia/web/UserController.java

@@ -181,9 +181,9 @@ public class UserController extends BaseController {
     @PostMapping("/user")
     @ApiOperation("无公司的用户")
     public List<User> user(Long companyId) {
-        List<User> users = userRepo.findAllByCompanyIdIsNull();
+        List<User> users = userRepo.findAllByCompanyIdIsNullAndDelFalse();
         if (ObjectUtil.isNotEmpty(companyId)) {
-            users.addAll(userRepo.findAllByCompanyId(companyId));
+            users.addAll(userRepo.findAllByCompanyIdAndDelFalse(companyId));
         }
         return users;
     }