From 03ad851496148e5c6d58aabaa7c622b088c4f1fa Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Mon, 23 Mar 2026 21:03:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=AF=BC=E5=85=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/language/msg/msg_cn.yml | 1 + .../src/main/resources/config/language/msg/msg_en.yml | 3 ++- .../src/main/resources/config/language/msg/msg_jp.yml | 3 ++- .../business/service/impl/AssetClassServiceImpl.java | 2 +- .../business/service/impl/LevelRoleServiceImpl.java | 4 ++-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml index dce191f..4d51ef8 100644 --- a/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml +++ b/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml @@ -202,3 +202,4 @@ msgcn: roleHasBinded: 角色已绑定用户，请先解绑再删除 dataMappingFormatError: 数据映射格式错误 categoryHasExisted: 分类已存在 + onlyOneRefType: 不可绑定多种关联类型 diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml index deb8850..f94c11b 100644 --- a/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml +++ b/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml @@ -201,4 +201,5 @@ msgen: levelRoleNameExist: The role already exists. roleHasBinded: The role is assigned to users. Please unbind them before deleting. dataMappingFormatError: Invalid data mapping format - categoryHasExisted: Category already exists. \ No newline at end of file + categoryHasExisted: Category already exists. + onlyOneRefType: Only one reference type can be bound. \ No newline at end of file diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml index 9ed6b28..e10635e 100644 --- a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml +++ b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml @@ -201,4 +201,5 @@ msgjp: levelRoleNameExist: 役割名が既に登録済み roleHasBinded: 役割はユーザーにバインドされている ので、削除する前にバインドを解除してください dataMappingFormatError: データマッピング形式が不正です - categoryHasExisted: カテゴリは既に存在します。 \ No newline at end of file + categoryHasExisted: カテゴリは既に存在します。 + onlyOneRefType: 複数の関連タイプをバインドすることはできません \ No newline at end of file diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/AssetClassServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/AssetClassServiceImpl.java index 5bf53cc..99076fb 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/AssetClassServiceImpl.java +++ b/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 smallChild = new ArrayList<>(); smallChild.add(basicAssetClassSmall); insertAssetClassSmallInfo.put(compAndMedium, smallChild); diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/LevelRoleServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/LevelRoleServiceImpl.java index 654b976..2c79d4c 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/LevelRoleServiceImpl.java +++ b/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; }