b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、基础数据修复bug

Browse Source 
2、客商模块修复bug
This commit is contained in:
b2894lxlx
2026-08-06 02:57:38 +08:00
parent 58726a675e
commit 28eb484a68
23 changed files with 294 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
blade-service/blade-system/src/main/java/org/springblade/system/excel/CargoTypeExportExcel.java
View File

@@ -48,19 +48,16 @@ public class CargoTypeExportExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@ExcelProperty("类型")
private String typeLevelName;
@ExcelProperty("货物类型")
@ExcelProperty("*货物类型")
private String cargoName;
@ExcelProperty("货物类型编码")
@ExcelProperty("*货物类型编码")
private String cargoCode;
@ExcelProperty("上级货物类型")
@ExcelProperty("*上级货物类型")
private String parentCargoName;
@ExcelProperty("上级货物类型编码")
@ExcelProperty("*上级货物类型编码")
private String parentCargoCode;
@ExcelProperty("创建人")

1
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/CargoTypeServiceImpl.java
View File

@@ -343,7 +343,6 @@ public class CargoTypeServiceImpl extends BaseServiceImpl<CargoTypeMapper, Cargo
private CargoTypeExportExcel toExportExcel(CargoType cargoType) {
CargoTypeExportExcel excel = new CargoTypeExportExcel();
excel.setTypeLevelName(Objects.equals(cargoType.getTypeLevel(), TYPE_LEVEL_ONE) ? "一级货物类型" : "二级货物类型");
excel.setCargoName(cargoType.getCargoName());
excel.setCargoCode(cargoType.getCargoCode());
excel.setParentCargoName("/");

6
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
View File

@@ -269,7 +269,11 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
}
role.setIsDeleted(BladeConstant.DB_NOT_DELETED);
if (Func.isEmpty(role.getTenantId())) {
throw new ServiceException("租户ID不能为空");
if (AuthUtil.isAdministrator()) {
role.setTenantId(BladeConstant.ADMIN_TENANT_ID);
} else {
throw new ServiceException("会话租户不可识别，拒绝创建角色");
}
}
return saveOrUpdate(role);
}