数字型服务id使用调优

security-center/src/main/java/com/lantone/security/aop/DataAuthFilterAspect.java

@@ -77,7 +77,7 @@ public class DataAuthFilterAspect {
         MethodSignature signature = (MethodSignature) point.getSignature();
         DataAuthFilter dataAuthFilter = signature.getMethod().getAnnotation(DataAuthFilter.class);
         //获取该用户数据权限
-        Map<String,List> dataAuthMap = redisService.hGetAll(SysUserUtils.getCurrentHospitalId()+"_"+SysUserUtils.getCurrentPrincipleId()+"_"+SysUserUtils.getCurrentSoftwareId());
+        Map<String,List> dataAuthMap = redisService.hGetAll(SysUserUtils.getCurrentHospitalId()+"_"+SysUserUtils.getCurrentPrincipleId()+"_"+SysUserUtils.getCurrentSoftwareIdStr());
 
         StringBuilder sqlFilter = new StringBuilder();
         sqlFilter.append(" (");

security-center/src/main/java/com/lantone/security/facade/FuncManagementFacade.java

@@ -82,10 +82,10 @@ public class FuncManagementFacade {
         if (ListUtil.isEmpty(roleIds)) {
             Asserts.fail("当前登录用户没有角色，请联系管理员~");
         }
-        if (StringUtil.isEmpty(SysUserUtils.getCurrentSoftwareId())) {
+        if (SysUserUtils.getCurrentSoftwareId() == null) {
             Asserts.fail("请求头服务id为空");
         }
-        getMenusTreeVo.setSoftwareId(Long.parseLong(SysUserUtils.getCurrentSoftwareId()));
+        getMenusTreeVo.setSoftwareId(SysUserUtils.getCurrentSoftwareId());
         getMenusTreeVo.setRoles(roleIds);
         menuList = roleSoftwareMenuFacade.getBaseMapper().getMenus(getMenusTreeVo);
         //3.整理菜单

security-center/src/main/java/com/lantone/security/facade/RoleManagementFacade.java

@@ -568,10 +568,10 @@ public class RoleManagementFacade {
      * @Return java.util.Map<java.lang.Long, java.util.List < com.lantone.security.dto.GetUserShowTreeDTO>>
      */
     public Map<String, Object> getUserShowMemuTree() {
-        if (StringUtil.isEmpty(SysUserUtils.getCurrentSoftwareId())) {
+        if (SysUserUtils.getCurrentSoftwareId() == null) {
             Asserts.fail("请求头服务id为空");
         }
-        Long softwareId = Long.parseLong(SysUserUtils.getCurrentSoftwareId());
+        Long softwareId = SysUserUtils.getCurrentSoftwareId();
         Map<String, Object> out = new HashMap<>();
         AtomicReference<List> notShowSoftwareMenuIds = new AtomicReference<>();
         //1.1获取当前用户的角色列表