看板页面获取不到用户时出错的问题修正

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -122,8 +122,9 @@ public class BoxKanbanController {
         List<Group> groupList = new ArrayList<>();
         List<Group> groupList = new ArrayList<>();
         groupList.add(Group.defaulGroup());
         groupList.add(Group.defaulGroup());
         Locale locale = servletRequest.getLocale();
         Locale locale = servletRequest.getLocale();
-        String userId = SecurityUtils.getCurrentUserId();
-        User user = userManager.get(userId);
+        String username = SecurityUtils.getLoginUsername();
+        if(!Strings.isNullOrEmpty(username)){
+            User user = userManager.findByUserName(username);
             if(user != null){
             if(user != null){
                 for (String groupid : user.getGroups()) {
                 for (String groupid : user.getGroups()) {
                     Group group = groupManager.get(groupid);
                     Group group = groupManager.get(groupid);
@@ -132,6 +133,8 @@ public class BoxKanbanController {
                     }
                     }
                 }
                 }
             }
             }
+        }
+
         return getGroupDto(groupList,locale,type);
         return getGroupDto(groupList,locale,type);
     }
     }
 
 

src/main/resources/messages_en_US.properties

@@ -59,7 +59,7 @@ smfcore.noconnecttion=No connecttion
 smfcore.loadMaterialFailed=Loading material failed:{0}
 smfcore.loadMaterialFailed=Loading material failed:{0}
 smfcore.checkNg=checking material is ng:{0}
 smfcore.checkNg=checking material is ng:{0}
 smfcore.loadMaterialFinished=Loading material finished: {0}
 smfcore.loadMaterialFinished=Loading material finished: {0}
-smfcore.lockMaterial=Equipment Performance Monitor
+smfcore.lockMaterial=EPM
 smfcore.lightGroup=Neo Light Grouping
 smfcore.lightGroup=Neo Light Grouping
 smfcore.order=Material Management
 smfcore.order=Material Management
 smfcore.workOrder=Work Order
 smfcore.workOrder=Work Order

src/main/resources/messages_ja_JP.properties

@@ -27,7 +27,6 @@ smfcore.noAccessUpdate=\u30E1\u30CB\u30E5\u30FC\u3092\u524A\u9664\u3059\u308B\u6
 smfcore.roleCannotDel=\u30ED\u30FC\u30EB[{0}]\u306B\u306F[{1}]\u4EBA\u306E\u30E6\u30FC\u30B6\u30FC\u304C\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u304A\u308A\u3001\u524A\u9664\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 smfcore.roleCannotDel=\u30ED\u30FC\u30EB[{0}]\u306B\u306F[{1}]\u4EBA\u306E\u30E6\u30FC\u30B6\u30FC\u304C\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3066\u304A\u308A\u3001\u524A\u9664\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 smfcore.notFindPos=\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30B9\u30C8\u30EC\u30FC\u30B8\u30B9\u30DA\u30FC\u30B9\u304C\u898B\u3064\u304B\u3089\u306A\u3044
 smfcore.notFindPos=\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30B9\u30C8\u30EC\u30FC\u30B8\u30B9\u30DA\u30FC\u30B9\u304C\u898B\u3064\u304B\u3089\u306A\u3044
 smfcore.error.barcode.empty=\u30D0\u30FC\u30B3\u30FC\u30C9\u304C\u30B9\u30AD\u30E3\u30F3\u3055\u308C\u306A\u3044
 smfcore.error.barcode.empty=\u30D0\u30FC\u30B3\u30FC\u30C9\u304C\u30B9\u30AD\u30E3\u30F3\u3055\u308C\u306A\u3044
-smfcore.error.barcode.many=\u8907\u6570\u306E\u6709\u52B9\u306A\u30D0\u30FC\u30B3\u30FC\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u304C\u3001\u5728\u5EAB\u306F\u3042\u308A\u307E\u305B\u3093
 smfcore.error.barcode.expired=\u6750\u6599\u304C\u53E4\u304F\u3066\u5728\u5EAB\u304C\u306A\u3044
 smfcore.error.barcode.expired=\u6750\u6599\u304C\u53E4\u304F\u3066\u5728\u5EAB\u304C\u306A\u3044
 smfcore.allBoxView.noReel=\u4FDD\u7BA1\u4E2D\u306E\u7D20\u6750\u304C\u306A\u3044{0}
 smfcore.allBoxView.noReel=\u4FDD\u7BA1\u4E2D\u306E\u7D20\u6750\u304C\u306A\u3044{0}
 smfcore.error.barcode.many=\u8907\u6570\u306E\u6709\u52B9\u306A\u30D0\u30FC\u30B3\u30FC\u30C9\u306E\u691C\u7D22
 smfcore.error.barcode.many=\u8907\u6570\u306E\u6709\u52B9\u306A\u30D0\u30FC\u30B3\u30FC\u30C9\u306E\u691C\u7D22