Browse Source

分类导入bug

zhc
review512jwy@163.com 3 weeks ago
parent
commit
03ad851496
  1. 1
      data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml
  2. 1
      data-center-business-common/src/main/resources/config/language/msg/msg_en.yml
  3. 1
      data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml
  4. 2
      data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/AssetClassServiceImpl.java
  5. 4
      data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/LevelRoleServiceImpl.java

1
data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml

@ -202,3 +202,4 @@ msgcn:
roleHasBinded: 角色已绑定用户,请先解绑再删除
dataMappingFormatError: 数据映射格式错误
categoryHasExisted: 分类已存在
onlyOneRefType: 不可绑定多种关联类型

1
data-center-business-common/src/main/resources/config/language/msg/msg_en.yml

@ -202,3 +202,4 @@ msgen:
roleHasBinded: The role is assigned to users. Please unbind them before deleting.
dataMappingFormatError: Invalid data mapping format
categoryHasExisted: Category already exists.
onlyOneRefType: Only one reference type can be bound.

1
data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml

@ -202,3 +202,4 @@ msgjp:
roleHasBinded: 役割はユーザーにバインドされている ので、削除する前にバインドを解除してください
dataMappingFormatError: データマッピング形式が不正です
categoryHasExisted: カテゴリは既に存在します。
onlyOneRefType: 複数の関連タイプをバインドすることはできません

2
data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/AssetClassServiceImpl.java

@ -687,7 +687,7 @@ public class AssetClassServiceImpl implements AssetClassService {
basicAssetClassSmall.setCompanyId(dbCompNameMapping.get(assetClassExcelCn.getCompanyName()).getId());
if (!noSmallDul.contains(compAndSmall)) {
noSmallDul.add(compAndSmall);
if (!insertAssetClassSmallInfo.containsKey(compAndSmall)) {
if (!insertAssetClassSmallInfo.containsKey(compAndMedium)) {
List<BasicAssetClassSmall> smallChild = new ArrayList<>();
smallChild.add(basicAssetClassSmall);
insertAssetClassSmallInfo.put(compAndMedium, smallChild);

4
data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/LevelRoleServiceImpl.java

@ -236,8 +236,8 @@ public class LevelRoleServiceImpl implements LevelRoleService {
DashboardLevelRoleUserExample countRoleUserExample = new DashboardLevelRoleUserExample();
countRoleUserExample.createCriteria()
.andLevelRoleIdEqualTo(levelRoleId)
.andUserIdEqualTo(bindUserParam.getUserId())
.andRefTypeEqualTo(bindUserParam.getRefType());
// .andRefTypeEqualTo(bindUserParam.getRefType())
.andUserIdEqualTo(bindUserParam.getUserId());
if (levelRoleUserMapperExt.countByExample(countRoleUserExample) > 0){
continue;
}

Loading…
Cancel
Save