diff --git a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java
index 62827f90..f067a0fc 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java
@@ -69,6 +69,10 @@ public class BasicHospTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
+ if(StrUtil.isEmpty(basicHospTypeRequest.getName())){
+ return ResultVOUtils.error(999, "名字不能为空!");
+ }
+
Boolean falg=basicHospTypeService.checkName(basicHospTypeRequest,1);
if(falg==false){
return ResultVOUtils.error(999, "院内分类名字已存在!");
@@ -89,6 +93,13 @@ public class BasicHospTypeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
+ if(StrUtil.isEmpty(basicHospTypeRequest.getName())){
+ return ResultVOUtils.error(999, "名字不能为空!");
+ }
+
+ if(basicHospTypeRequest.getCode().equals(basicHospTypeRequest.getParentCode())){
+ return ResultVOUtils.error(999, "上级菜单不能选择自己!");
+ }
Boolean falg=basicHospTypeService.checkName(basicHospTypeRequest,2);
if(falg==false){
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index bfc8fa06..13ac33a1 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -318,8 +318,8 @@
AND relCode = #{relCode}
- AND relCode is null
- or trim(relCode) = ''
+ AND (relCode is null
+ or trim(relCode) = '')
AND supName LIKE concat('%', #{supName}, '%')