|
|
@@ -271,8 +271,8 @@ public class LoginController implements LoginControllerAPI {
|
|
|
student.setAdmissNum(card_number);
|
|
|
student.setName(user_name);
|
|
|
student.setPhone(phone);
|
|
|
- student.setSchool(campus);
|
|
|
- student.setSchoolId(campus == null ? 0 : eSchool.stringOf(campus));
|
|
|
+ student.setSchool(!StringUtils.hasText(campus) ? "墨轩湖校区" : campus);
|
|
|
+ student.setSchoolId(!StringUtils.hasText(campus) ? 1 : eSchool.stringOf(campus));
|
|
|
student.setSex(gender == 1 ? "男" : "女");
|
|
|
// student.setCollege(college);
|
|
|
// student.setMajor(profession);
|
|
|
@@ -280,7 +280,7 @@ public class LoginController implements LoginControllerAPI {
|
|
|
//student.setClassstr(classStr);
|
|
|
student.setCardId(id_card);//身份证号
|
|
|
|
|
|
- if(!(student.getIsPay() != null && student.getIsPay().intValue() == 1)){
|
|
|
+ if(student.getIdenType().intValue() == 1 && !(student.getIsPay() != null && student.getIsPay().intValue() == 1)){
|
|
|
List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(card_number,TimeExchange.getYear());
|
|
|
BigDecimal payAmount = new BigDecimal(BigInteger.ZERO);//实缴金额
|
|
|
BigDecimal yjPayAmount = new BigDecimal(BigInteger.ZERO);//应缴金额
|
