Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java

@@ -191,7 +191,7 @@ public interface Constants {
 
 
     //用户组
-    String USER_GROUP_ADMINISTRATOR = "ADMINISTRATOR";
+    String USER_GROUP_ADMINISTRATOR = "ADMINISTRATORS";
     //车间调度
     String USER_GROUP_CJDD = "CJDD";
     //总计划

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java

@@ -99,7 +99,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
         String user = CommonMethods.getUser();
         String userBo = HandleEnum.USER.getHandle(site, user);
         List<UserGroup> userGroupList = userGroupService.getUserGroupListByUserBo(userBo);
-        String role = "ADMINISTRATOR";
+        String role = "ADMINISTRATORS";
         if (userGroupList != null && userGroupList.size() > 0) {
             for (UserGroup userGroupModel: userGroupList) {
                 String userGroup = userGroupModel.getUserGroup();