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