f6a84fd6b3
fix: assign each user to single leaf dept to prevent duplicates
2026-07-10 10:09:47 +08:00
fb54a6c466
fix: assign users to leaf departments only, handle multi-branch dept chains
2026-07-10 10:08:07 +08:00
3ccb878092
fix: fetch users from all sub-departments in syncAll and fetchOrgTreeWithUsers
2026-07-10 10:06:35 +08:00
3992f6c33f
feat: implement fetchOrgTree and fetchOrgTreeWithUsers via dingtalk API
2026-07-10 10:04:59 +08:00
6029d8e2fd
refactor(server): remove Department/UserDepartment entities, CampusScope, and departmentId from all entities
...
- Delete department.entity.ts, user-department.entity.ts
- Remove Department/UserDepartment from entities/index.ts
- Remove departmentId column from 18 entities (AttendanceRecord, ArchiveAttachment, Bill, ClassSchedule, Classroom, ClassroomRental, Deposit, DepositInstallment, ExamScore, LearningRecord, Occupancy, PersonalExpense, ResultArchive, Room, RoomExpense, Student, StudentEnrollment, StudentProfile, StudentReport)
- Remove departments/ module entirely
- Delete campus-scope.ts, campus-scope.middleware.ts (request-utils.ts kept — it's just IP extraction)
- Simplify common.module.ts to empty module
- Remove CampusScopeMiddleware from app.module.ts
- Remove all CampusScope injections and filter calls across all services
- Remove departmentId from all DTOs and controllers
- Simplify dingtalk/wecom sync to only sync users (no dept table)
- Update seed module to remove department seeding
- Clean frontend compilation
2026-07-09 17:51:32 +08:00
22bc1876d8
refactor: remove departmentId from Class entity
2026-07-09 17:32:37 +08:00
570ef7b7e9
revert: remove deepest-2-levels filter, restore full org tree
2026-07-09 17:07:22 +08:00
e87e5e2096
refactor: syncAll creates Student + StudentDingMapping directly
2026-07-09 17:05:54 +08:00
73c1ea7a76
fix: correct studentId-as-userId bugs in 3 files
...
- dingtalk.service.ts syncOneUser: find Student by userId before mapping,
use Student.id (not User.id) as studentId FK
- sync.service.ts importDingTalkUsers: type coercion for studentId
(method deleted in Task 4, minimal compile fix)
- schedule-sync.service.ts getStatus: remove broken teacher mapping
query (teacher scheduling deprecated); hardcode mappedTeachers=0,
totalTeachers=0
2026-07-09 17:04:35 +08:00
86f126671c
fix: repair 5 sites where StudentDingMapping.studentId was misused as User FK
...
- dingtalk.service.ts syncOneUser: query studentRepo (not userRepo) by mapping.studentId
- sync.service.ts importDingTalkUsers: skip User role lookup for existing mappings
- attendance.service.ts autoMatchDingRecords: use studentId directly, remove second-hop query
- schedule-sync.service.ts syncAll: skip teacher mapping block (deprecated)
- rbac.service.ts getUnboundUsers: return [] (method deleted in Task 4)
2026-07-09 17:00:00 +08:00
ef1b46b9f4
refactor: replace UserDingMapping with StudentDingMapping entity
2026-07-09 16:53:25 +08:00
4f3b5112b0
feat: filter org-tree-with-users to deepest 2 levels
2026-07-09 16:12:13 +08:00
0509175a57
feat: add getDeptDepthMap BFS method for org tree depth tracking
2026-07-09 16:08:53 +08:00
166066f49f
feat(sync): add ImportClassItemDto and expose deptIds in org-tree-with-users
2026-07-09 12:21:39 +08:00
454a0d24c6
fix: release beds/lockers in batchCheckOut
...
The batchCheckOut method was not releasing assigned beds and lockers
after checkout, leaving them orphaned as 'occupied'. Added the same
release pattern used in checkOut() — using runner.manager.update()
since batchCheckOut operates inside a QueryRunner transaction.
2026-07-09 12:05:36 +08:00
3835110204
feat: add importDingTalkUsers and org-tree-with-users to SyncService
2026-07-09 11:04:24 +08:00
6e0ad8759f
feat: syncOneUser skips Students with non-active status
2026-07-09 10:05:41 +08:00
42d3f0e27f
feat: DingTalk attendance import + integration config + expense types + UI polish
...
Server:
- Add DingTalk attendance import service with SSE progress streaming
- Add IntegrationConfig entity & module for multi-tenant DingTalk setup
- Add ExpenseType entity & ExpenseTypesModule
- Add SeedModule for DB initialization
- Add UserDingMapping entity for DingTalk user linkage
- Attendance service: import flow with dedup & student auto-mapping
- Rooms service: time-range overlap queries
- Sync controller/service: DingTalk integration wiring
- Permission guard: refactor to pure re-export
- Campus scope middleware: tenant-aware filtering
Admin UI:
- Attendance page: import UI with progress & result summary
- All pages: tableStyle/tablePagination standardization
- Login page: responsive styling
- Sensitive data: useViewSensitive hook for masked viewing
- Vite config: path aliases, build optimization
- Test infra: vitest config, test utilities
Docs: PRD DingTalk batch 1 & 2 design docs
2026-07-09 09:11:56 +08:00
f1959f0d2a
fix: switch DingTalk attendance API from getcolumnval to listRecord
2026-07-08 14:49:22 +08:00
166d0b2694
feat: auto-create Student for DingTalk users on sync; add DingTalk env to ecosystem config
2026-07-08 14:34:49 +08:00
693ba5d3b8
feat: complete remaining PRD tasks — RBAC nodes and staff split, schedule month view, auto-generate attendance from schedules, plus fix TypeORM name
2026-07-06 18:10:14 +08:00
c81b0a0b5c
chore: commit remaining integration files, PM2 single instance, PRD doc
2026-07-06 16:04:53 +08:00
72b0eed36e
fix: resolve TS strict type errors in sync services (null→undefined)
2026-07-06 15:18:47 +08:00
