getLoginInfo

src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -240,16 +240,13 @@ public class LoginServiceImpl implements ILoginService {
             List<Department> departmentList = departmentService.listByIds(departmentIds);
             tokenSession.set(GlobalConstant.LOGIN_USER_DEPT_LIST_KEY, departmentList);
             //如果此人有岗位  使用岗位的deptId  找到当前组织机构
-            if (ObjectUtil.isNotNull(post.getId())) {
+            if (post != null && ObjectUtil.isNotNull(post.getId())) {
                 Department department = departmentService.getById(post.getDeptId());
                 tokenSession.set(GlobalConstant.LOGIN_USER_DEPT_INFO_KEY, department);
                 loginUser.setDepartmentId(department.getId());
             } else {
-
                 Department department = departmentList.get(0);
-
                 tokenSession.set(GlobalConstant.LOGIN_USER_DEPT_INFO_KEY, department);
-
                 loginUser.setDepartmentId(department.getId());
             }
 

src/main/resources/sqlScript/20231129_sql.sql

@@ -211,8 +211,8 @@ CREATE TABLE wf_head_teacher_leave
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
     `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
     `leave_reason`varchar(20) NULL DEFAULT NULL COMMENT '请假原因(xjr_dictionary_item[leave_reason])',
-    `start_time` date NULL DEFAULT NULL COMMENT '开始时间',
-    `end_time` date NULL DEFAULT NULL COMMENT '结束时间',
+    `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间',
+    `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间',
     `is_substitute` INT NOT NULL default 0 COMMENT '是否有替班教师（1:是 0:否）',
     `substitute_user_id` bigint NULL DEFAULT NULL COMMENT '替换教师',
     `remark` varchar(1000) COMMENT '备注',
@@ -266,7 +266,7 @@ CREATE TABLE student_honors
     `class_id` BIGINT NULL DEFAULT NULL COMMENT '班级id',
     `student_user_id` BIGINT NULL DEFAULT NULL COMMENT '学生用户编号',
     `student_id` VARCHAR(30) NULL DEFAULT NULL COMMENT '学号',
-    `major_name` VARCHAR(50) NULL DEFAULT NULL COMMENT '所学专业',
+    `major_set_id` bigint NOT NULL COMMENT '专业(base_major)',
     `honors_level` varchar(20) NULL DEFAULT NULL COMMENT '荣誉级别(xjr_dictionary_item[honors_level])',
     `honors_grade`varchar(20) NULL DEFAULT NULL COMMENT '荣誉等级(xjr_dictionary_item[honors_grade])',
     `honors_type`varchar(20) NULL DEFAULT NULL COMMENT '荣誉类型(xjr_dictionary_item[honors_type])',
@@ -371,6 +371,30 @@ CREATE TABLE teacher_award
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '教师获奖登记';
 -- ------------------------------------------------------------------教师获奖登记--------------------------------------------------------------------
 
+-- ------------------------------------------------------------------加班申请--------------------------------------------------------------------
+-- ----------------------------
+-- 加班申请-加班人
+-- ----------------------------
+DROP TABLE IF EXISTS wf_overtime_teacher;
+CREATE TABLE wf_overtime_teacher
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `wf_overtime_id` bigint NULL DEFAULT NULL COMMENT '加班申请编号',
+    `teacher_user_id` bigint NULL DEFAULT NULL COMMENT '加班人编号',
+    `teacher_user_name` varchar(200) NULL DEFAULT NULL COMMENT '加班人姓名',
+    `department_id` bigint NULL DEFAULT NULL COMMENT '所属机构(xjr_department)',
+    `department_name` varchar(200) NULL DEFAULT NULL COMMENT '所属机构(xjr_department)',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '加班申请-加班人';
+-- ------------------------------------------------------------------加班申请--------------------------------------------------------------------
+