diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index 369317c8e..569e0b82a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -71,7 +71,6 @@ public class LabelServiceImpl implements LabelService { public Long createLabel(LabelSaveReqVO createReqVO) { Long organId = createReqVO.getOrganId() == null ? getUserOrganId() : createReqVO.getOrganId(); LabelTypeDO labelType = resolveLabelType(createReqVO.getLabelTypeId(), createReqVO.getType(), organId); - validateCustomType(labelType); // 插入 LabelDO label = BeanUtils.toBean(createReqVO, LabelDO.class); @@ -90,11 +89,9 @@ public class LabelServiceImpl implements LabelService { // 校验存在 LabelDO labelDO = validateLabelExists(updateReqVO.getId()); - LabelTypeDO oldType = resolveLabelType(labelDO.getLabelTypeId(), labelDO.getType(), labelDO.getOrganId()); - validateCustomType(oldType); + resolveLabelType(labelDO.getLabelTypeId(), labelDO.getType(), labelDO.getOrganId()); LabelTypeDO newType = resolveLabelType(updateReqVO.getLabelTypeId(), updateReqVO.getType(), labelDO.getOrganId()); - validateCustomType(newType); // 更新 LabelDO updateObj = BeanUtils.toBean(updateReqVO, LabelDO.class); @@ -113,7 +110,6 @@ public class LabelServiceImpl implements LabelService { public void deleteLabel(Long id) { // 校验存在 LabelDO labelDO = validateLabelExists(id); - validateCustomType(resolveLabelType(labelDO.getLabelTypeId(), labelDO.getType(), labelDO.getOrganId())); List machineDOS = machineMapper.selectList(new LambdaQueryWrapperX() .select(MachineDO::getId) @@ -208,13 +204,6 @@ public class LabelServiceImpl implements LabelService { return type == null ? null : type.trim(); } - /** 标签接口只能操作自定义类型,系统默认类型由字段管理维护。 */ - private void validateCustomType(LabelTypeDO type) { - if (type == null || "SYSTEM".equals(type.getSource())) { - throw new ServiceException(LABEL_SYSTEM_TYPE_NOT_OPERABLE); - } - } - private LabelTypeDO resolveLabelType(Long labelTypeId, String type, Long organId) { if (labelTypeId != null) { LabelTypeDO labelType = labelTypeMapper.selectById(labelTypeId);