Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education

# Conflicts:
#	src/main/java/org/rcisoft/core/result/ResultServiceEnums.java
#	src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -119,6 +119,9 @@ public class BArrangeServiceImpl implements BArrangeService {
 //        if (arrange.isEmpty()){
 //            throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
 //        }
+        if(arrange.getString("desc").length()>255){
+            throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
+        }
         bArrange.setDescription(arrange.getString("desc"));
         bArrange.setTermCode(arrange.getString("termCode"));
         bArrange.setStatus("0");
@@ -132,6 +135,9 @@ public class BArrangeServiceImpl implements BArrangeService {
             JSONObject subtask = childList.getJSONObject(i);
             BSubtask bSubtask = new BSubtask();
             List<BSubAgency> bSubAgencyList = new ArrayList<>();
+            if(subtask.getString("name").length()>256){
+                throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
+            }
             bSubtask.setName(subtask.getString("name"));
             bSubtask.setArrangeId(bArrange.getBusinessId());
             bSubtask.setStatus("0");

src/main/java/org/rcisoft/business/brooms/controller/BRoomsController.java

@@ -52,14 +52,14 @@ public class BRoomsController extends FileController<BRooms> {
     @ApiImplicitParams({@ApiImplicitParam(name = "campus", value = "校区(1)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "building", value = "教学楼(1-50)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "category", value = "教室类型(1)", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "classroomNo", value = "教室号(1-50)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "classroomNo", value = "教室号(1-5)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "classroomName", value = "教室名(1-50)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "classSeat", value = "座位数(1-5)", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "examSeat", value = "考试座位数(1-5)", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "plan", value = "计划(1-50)", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "code", value = "教室编号(1-50)", required = true, dataType = "varchar")})
     @PostMapping(value = "/add")
-    public Result add( @ApiIgnore BRooms bRooms, BindingResult bindingResult) {
+    public Result add( @ApiIgnore @Valid BRooms bRooms, BindingResult bindingResult) {
         bRooms.setToken(getToken());
         PersistModel data = bRoomsServiceImpl.save(bRooms);
         return Result.builder(data,