病区逻辑调整

common/src/main/java/com/lantone/common/vo/UpdateRegionVO.java

@@ -3,6 +3,7 @@ package com.lantone.common.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
@@ -25,8 +26,9 @@ import java.util.List;
     @ApiModelProperty(value = "用户ID",hidden = true)
     private Long userId;
 
-    @ApiModelProperty(value = "医院名称")
-    private String hospitalName;
+   @ApiModelProperty(value = "医院名称",required = true)
+   @NotBlank(message = "医院名称不能为空")
+   private String hospitalName;
 
     @ApiModelProperty(value = "联系人")
     private String liaison;
@@ -37,14 +39,16 @@ import java.util.List;
     @ApiModelProperty(value = "病区编码")
     private String code;
 
-    @ApiModelProperty(value = "病区名称")
-    private String name;
+   @ApiModelProperty(value = "病区名称",required = true)
+   @NotBlank(message = "病区名称不能为空")
+   private String name;
 
     @ApiModelProperty(value = "首字母拼音")
     private String spell;
 
-    @ApiModelProperty(value = "区域类别")
-    private String station;
+   @ApiModelProperty(value = "区域类别",required = true)
+   @NotBlank(message = "区域类别不能为空")
+   private String station;
 
     @ApiModelProperty(value = "排序")
     private String orderNo;

security-center/src/main/java/com/lantone/security/facade/RegionManagementFacade.java

@@ -22,6 +22,7 @@ import com.lantone.dblayermbg.facade.DeptFacade;
 import com.lantone.dblayermbg.facade.RegionFacade;
 import com.lantone.dblayermbg.service.RegionDeptService;
 import com.lantone.common.enums.IsDeleteEnum;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -82,7 +83,7 @@ public class RegionManagementFacade {
                 ViewRegionDTO viewRegionDTO = records.get(0);
                 String deptName = viewRegionDTO.getDeptName();
                 List<String> deptNameList = viewRegionDTO.getDeptNameList();
-                if(deptName.contains(",")){
+                if(StringUtils.isNotBlank(deptName) && deptName.contains(",")){
                     for (String str : deptName.split(",")) {
                         deptNameList.add(str);
                     }