@@ -270,6 +270,7 @@ public class DzCardsController extends BaseController
cardUserBody.setDirectionStudy(JSONArray.parse(sysUser.getDirectedStudy()));
}
BeanUtils.copyProperties(dzCards, cardUserBody, "password", "nickName", "location", "examType", "endYear");
+ cardUserBody.setCampusSchoolId(dzCards.getCampusId());
return success(cardUserBody);
@@ -185,6 +185,8 @@ public class SysRegisterService
upCard.setClassId(cardUserBody.getClassId());
upCard.setCampusId(cardUserBody.getCampusSchoolId());
upCard.setCampusClassId(cardUserBody.getCampusClassId());
+
+ userService.updateUserInfo(upUser);
cardsService.updateDzCards(upCard);
@@ -26,6 +26,9 @@ public class DzClasses extends BaseEntity
@Excel(name = "学校")
private Long schoolId;
+ @Excel(name = "兼容学校")
+ private Long campusId;
private DzSchool school;
/** 开班年份 */
@@ -107,7 +110,7 @@ public class DzClasses extends BaseEntity
public Long getSchoolId()
{
- return schoolId;
+ return null != schoolId ? schoolId : campusId;
public void setYear(Long year)
@@ -160,6 +163,14 @@ public class DzClasses extends BaseEntity
return stats;
+ public Long getCampusId() {
+ return campusId;
+ }
+ public void setCampusId(Long campusId) {
+ this.campusId = campusId;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)