commit
This commit is contained in:
+11
-9
@@ -216,16 +216,18 @@ public class TeacherCongressDelegatePushController {
|
||||
|
||||
TeacherCongressDelegatePush oredElse = delegateList.stream().filter(d -> d.getLoginName().equals(quota_allocation.getSchoolLeadersLoginName())).findFirst().orElse(null);
|
||||
|
||||
if (Lang.isNotEmpty(oredElse)) {
|
||||
if (Lang.isEmpty(oredElse)) {
|
||||
View_user schoolLeader = dao.fetch(View_user.class, Cnd.where(View_user::getLoginname, "=", quota_allocation.getSchoolLeadersLoginName()));
|
||||
userList.add(0, NutMap.NEW().setv("userId", schoolLeader.getId())
|
||||
.setv("loginName", schoolLeader.getLoginname())
|
||||
.setv("userName", schoolLeader.getUsername())
|
||||
.setv("professionalTitle", schoolLeader.getProfessionalTitle())
|
||||
.setv("professionalLevel", schoolLeader.getProfessionalLevel())
|
||||
.setv("sex", schoolLeader.getSex())
|
||||
.setv("nation", schoolLeader.getNation())
|
||||
);
|
||||
if (Lang.isNotEmpty(schoolLeader)){
|
||||
userList.add(0, NutMap.NEW().setv("userId", schoolLeader.getId())
|
||||
.setv("loginName", schoolLeader.getLoginname())
|
||||
.setv("userName", schoolLeader.getUsername())
|
||||
.setv("professionalTitle", schoolLeader.getProfessionalTitle())
|
||||
.setv("professionalLevel", schoolLeader.getProfessionalLevel())
|
||||
.setv("sex", schoolLeader.getSex())
|
||||
.setv("nation", schoolLeader.getNation())
|
||||
);
|
||||
}
|
||||
}
|
||||
return Result.success(Map.of("userData", userList, "userValue", delegateList));
|
||||
}
|
||||
|
||||
+2
-2
@@ -100,12 +100,12 @@ public class TeacherCongressDelegatePush extends BaseModel {
|
||||
|
||||
@Column
|
||||
@Comment("主要工作简历")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 500)
|
||||
@ColDefine(type = ColType.TEXT)
|
||||
private String resume;
|
||||
|
||||
@Column
|
||||
@Comment("现实表现")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 500)
|
||||
@ColDefine(type = ColType.TEXT)
|
||||
private String performance;
|
||||
|
||||
@Column
|
||||
|
||||
Reference in New Issue
Block a user