Browse Source

机构保存时代码为空提示

wangliang 4 years ago
parent
commit
d4a734ea0f

+ 11 - 8
themis-admin/src/main/java/com/qmth/themis/admin/api/TBOrgController.java

@@ -55,12 +55,12 @@ public class TBOrgController {
     //    @Cacheable(value = "org_cache", key = "#p0")
     @ApiOperation(value = "机构查询分页接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "机构信息", response = TBOrgDto.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrgDto.class)})
     public Result queryByPage(@ApiParam(value = "机构代码", required = false) @RequestParam(required = false) String code,
-            @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name,
-            @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable,
-            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+                              @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name,
+                              @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable,
+                              @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+                              @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         return ResultUtil.ok(tbOrgService.queryByPage(new Page<>(pageNumber, pageSize), code, name, enable));
     }
 
@@ -68,11 +68,14 @@ public class TBOrgController {
     @ApiOperation(value = "机构新增/编辑接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
     public Result save(@ApiParam(value = "机构信息", required = true) @RequestBody TBOrg tbOrg) {
         if (Objects.isNull(tbOrg)) {
             throw new BusinessException(ExceptionResultEnum.ORG_INFO_IS_NULL);
         }
+        if (Objects.isNull(tbOrg.getCode()) || Objects.equals(tbOrg.getCode(), "")) {
+            throw new BusinessException(ExceptionResultEnum.ORG_CODE_IS_NULL);
+        }
         if (Objects.nonNull(tbOrg.getCode()) && Objects.equals(tbOrg.getCode().toUpperCase(), SystemConstant.ADMIN)) {
             throw new BusinessException("admin为超级管理员专属编码,请重新输入");
         }
@@ -106,10 +109,10 @@ public class TBOrgController {
     @ApiOperation(value = "机构停用/启用接口")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @Transactional
-    @ApiResponses({ @ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
     public Result enableOrg(@ApiJsonObject(name = "enableOrg", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "机构id"),
-            @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用") }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {
+            @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用")}) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {
         if (Objects.isNull(user.get("id")) || Objects.equals(user.get("id"), "")) {
             throw new BusinessException(ExceptionResultEnum.ORG_ID_IS_NULL);
         }