|
@@ -3107,7 +3107,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
if(userId!=null){
|
|
|
queryWrapper.eq("id",userId);
|
|
|
}
|
|
|
- queryWrapper.orderByAsc("department_id");
|
|
|
+ queryWrapper.eq("is_active",1).orderByAsc("department_id");
|
|
|
List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
|
|
|
List<User> userList;
|
|
|
long total=0;
|