Merge branch 'main' of https://git.mowei.com.cn/wyh/gan into main

~
2024-08-15 18:35:35 +08:00 · 2024-08-15 18:35:24 +08:00
1 changed files with 6 additions and 0 deletions
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
@ -94,6 +94,12 @@ public class AppLoginController {
        );
        Assert.notNull(appSchool, "学校不存在！");

+        if (!"其他".equals(appSchool.getName()) && (
+                org.apache.commons.lang3.StringUtils.isBlank(registerForm.getEmail()) || org.apache.commons.lang3.StringUtils.isBlank(registerForm.getProve()))
+        ) {
+            return R.fail(2001,"请填写邮件地址或上传学校证明！");
+        }
+
        String email = registerForm.getEmail();
        if (org.apache.commons.lang3.StringUtils.isNotBlank(email)) {
            if (email.indexOf("@") == -1) {
Author	SHA1	Message	Date
linhw	b3ae25d62b	Merge branch 'main' of https://git.mowei.com.cn/wyh/gan into main	2024-08-15 18:35:35 +08:00
linhw	53dc7bc072	~	2024-08-15 18:35:24 +08:00