diff --git a/cas-common/src/main/java/com/inscloudtech/common/helper/LoginHelper.java b/cas-common/src/main/java/com/inscloudtech/common/helper/LoginHelper.java index 2abea1c..dc5b410 100644 --- a/cas-common/src/main/java/com/inscloudtech/common/helper/LoginHelper.java +++ b/cas-common/src/main/java/com/inscloudtech/common/helper/LoginHelper.java @@ -30,9 +30,6 @@ public class LoginHelper { public static final String LOGIN_USER_KEY = "loginUser"; public static final String USER_KEY = "userId"; - public static final String REPORT_ADMIN_PERMISSION = "report:admin"; - public static final String STOCK_VIEW_ADMIN = "stock:viewAdmin"; - public static final String PLAN_VIEW_ADMIN = "plan:viewAdmin"; /** * 登录系统 diff --git a/cas-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java index 394c215..16cb145 100644 --- a/cas-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java @@ -298,6 +298,7 @@ public class SysOssServiceImpl implements ISysOssService { updateDuplicateArIdSet.add(item.getOssId()); item.setDuplicateCase(1); item.setOssId(md5Id); + item.setOriginalName(item.setOriginalName() + "(并入)"); if(OTHER_BUSINESS_MODULE.contains(businessModule)){ if(!item.getFileName().contains("(并入)")){ item.setFileName(item.getFileName() + "(并入)");