Merge remote-tracking branch 'origin/main'

This commit is contained in:
gaoqr
2025-01-18 11:56:16 +08:00
2 changed files with 7 additions and 2 deletions
@@ -8,7 +8,7 @@ import com.cf.imes.framework.common.exception.ErrorCode;
*/
public interface ErrorCodeConstants {
public static final ErrorCode PARTS_NOT_EXISTS = new ErrorCode(1_004_000_000, "配件不存在");
public static final ErrorCode PARTS_GOOD_ID_EXISTS = new ErrorCode(1_004_000_000, "配件标识已存在");
public static final ErrorCode PARTS_NOT_EXISTS = new ErrorCode(1_004_001_000, "配件不存在");
public static final ErrorCode PARTS_GOOD_ID_EXISTS = new ErrorCode(1_004_001_001, "配件标识已存在");
}
@@ -97,6 +97,7 @@ public class PartsServiceImpl implements PartsService {
}
@Override
@OrganIgnore
public void delete(Long id, Long organId) {
// 校验存在
if (!validateExistsById(id, getOrganId(BASE_PARTS_DELETE_PERMISSION, getLoginUser().getId(), organId))) {
@@ -129,12 +130,14 @@ public class PartsServiceImpl implements PartsService {
}
@Override
@OrganIgnore
public PartsDO get(Long id, Long organId) {
organId = getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), organId);
return partsMapper.selectById(id, organId);
}
@Override
@OrganIgnore
public PageResult<PartsDO> getPage(PartsPageReqVO pageReqVO) {
pageReqVO.setOrganId(getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), pageReqVO.getOrganId()));
@@ -142,12 +145,14 @@ public class PartsServiceImpl implements PartsService {
}
@Override
@OrganIgnore
public void exportTemplate(HttpServletResponse response, String value) {
String rootPath = getSavePath();
FileHelperUtil.getFile(rootPath, response, value);
}
@Override
@OrganIgnore
public void importPartsList(List<PartsImportExcelVO> importParts, boolean isUpdateSupport, Long organId) {
// 组织id