活动报错解决

src/main/java/com/xjrsoft/module/base/entity/BaseClassroom.java

@@ -72,7 +72,7 @@ public class BaseClassroom implements Serializable {
     private Integer status;
 
     @ApiModelProperty("描述")
-    private String describe;
+    private String explains;
 
     @ApiModelProperty("座位数")
     private Integer seatNumber;

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -213,6 +213,7 @@ public class UserController {
                     .select(User::getId)
                     .select("d1.name", UserPageVo::getEmployWay)
                     .select("d2.name", UserPageVo::getEmployType)
+                    .selectAs(BaseStudentSchoolRoll::getClassId, UserPageVo::getClassId)
                     .select(User.class, x -> VoToColumnUtil.fieldsToColumns(UserPageVo.class).contains(x.getProperty()))
                     .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
                     .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, User::getId)
@@ -263,6 +264,7 @@ public class UserController {
                             .select(User::getId)
                             .select("d1.name", UserPageVo::getEmployWay)
                             .select("d2.name", UserPageVo::getEmployType)
+                            .selectAs(BaseStudentSchoolRoll::getClassId, UserPageVo::getClassId)
                             .select(User.class, x -> VoToColumnUtil.fieldsToColumns(UserPageVo.class).contains(x.getProperty()))
                             .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, User::getId)
                             .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, User::getId)

src/main/java/com/xjrsoft/module/organization/vo/UserPageVo.java

@@ -102,4 +102,6 @@ public class UserPageVo implements Serializable {
     private String employType;
 
     private String employWay;
+
+    private Long classId;
 }

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

@@ -346,14 +346,14 @@ CREATE TABLE `wechat_message_template` (
 -- ---------------------------------------------------------------------------------------------
 ALTER TABLE `base_student_scholarship_category`   
   ADD COLUMN `category` VARCHAR(30) NULL   COMMENT '奖助学金类型(xjr_dictionary_item[s_b_categories])' AFTER `remark`,
-  ADD COLUMN `support_source` VARCHAR(200) NULL   COMMENT '资助单位/个人' AFTER `category`;
+  ADD COLUMN `support_source` VARCHAR(200) NULL   COMMENT '资助单位/个人' AFTER `category`;publishing DATE
 
 -- ---------------------------------------------------------------------------------------------
 -- 教室信息增加字段
 -- ---------------------------------------------------------------------------------------------
 ALTER TABLE `base_classroom`   
   ADD COLUMN `seat_number` INT NULL   COMMENT '座位数',
-  ADD COLUMN `describe` VARCHAR(500) NULL   COMMENT '描述';
+  ADD COLUMN `explains` VARCHAR(500) NULL   COMMENT '描述';
   
 -- ---------------------------------------------------------------------------------------------
 -- 自动分班增加锁定班级功能