Merge remote-tracking branch 'remotes/origin/dev_1.0.0' into release_1.0.0

src/main/java/cn/com/qmth/mps/service/impl/PaperServiceImpl.java

@@ -117,15 +117,15 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 				String code = trimAndNullIfBlank(line.getValue(0));
 				if (StringUtils.isBlank(code)) {
 					msg.append("  科目代码不能为空");
-				} else if (code.length() > 20) {
-					msg.append("  科目代码不能超过20个字符");
+				} else if (code.length() > 50) {
+					msg.append("  科目代码不能超过50个字符");
 				}
 
 				String name = trimAndNullIfBlank(line.getValue(1));
 				if (StringUtils.isBlank(name)) {
 					msg.append("  科目名称不能为空");
-				} else if (name.length() > 20) {
-					msg.append("  科目名称不能超过20个字符");
+				} else if (name.length() > 50) {
+					msg.append("  科目名称不能超过50个字符");
 				}
 				if (msg.length() == 0) {
 					CourseEntity course = courseService.saveOrGet(exam.getSchoolId(), code, name);
@@ -349,16 +349,16 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 				String code = trimAndNullIfBlank(line.getValue(0));
 				if (StringUtils.isBlank(code)) {
 					msg.append("  科目代码不能为空");
-				} else if (code.length() > 20) {
-					msg.append("  科目代码不能超过20个字符");
+				} else if (code.length() > 50) {
+					msg.append("  科目代码不能超过50个字符");
 				}
 				imp.setCourseCode(code);
 
 				String name = trimAndNullIfBlank(line.getValue(1));
 				if (StringUtils.isBlank(name)) {
 					msg.append("  科目名称不能为空");
-				} else if (name.length() > 20) {
-					msg.append("  科目名称不能超过20个字符");
+				} else if (name.length() > 50) {
+					msg.append("  科目名称不能超过50个字符");
 				}
 				if (msg.length() == 0) {
 					CourseEntity course = courseService.saveOrGet(exam.getSchoolId(), code, name);

src/main/java/cn/com/qmth/mps/service/impl/UserServiceImpl.java

@@ -163,16 +163,16 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 				String name = trimAndNullIfBlank(line.getValue(0));
 				if (StringUtils.isBlank(name)) {
 					msg.append("  姓名不能为空");
-				} else if (name.length() > 20) {
-					msg.append("  姓名不能超过20个字符");
+				} else if (name.length() > 50) {
+					msg.append("  姓名不能超过50个字符");
 				}
 				impuser.setName(name);
 
 				String loginname = trimAndNullIfBlank(line.getValue(1));
 				if (StringUtils.isBlank(loginname)) {
 					msg.append("  登录名不能为空");
-				} else if (loginname.length() > 20) {
-					msg.append("  登录名不能超过20个字符");
+				} else if (loginname.length() > 50) {
+					msg.append("  登录名不能超过50个字符");
 				}
 				impuser.setLoginName(loginname);