diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
index 59b5fec2..5ae2d7ab 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
@@ -628,7 +628,7 @@ public class ProductModelController extends ControllerBase{
             String indexName = null;
             DataFormatter dataFormatter = new DataFormatter();
             for (int index = 3, count = sheet.getLastRowNum(); index <= count; index++) {
-//                log.info("处理第{}行", index);
+                log.info("处理第{}行", index);
                 Row row = sheet.getRow(index);
                 if (Objects.isNull(row)) {
                     break;
@@ -643,6 +643,9 @@ public class ProductModelController extends ControllerBase{
                     indexName=dto.getIndexName();
                 }
                 Cell cell1=row.getCell(1);
+                if ((Objects.isNull(cell1) || StrUtil.isBlank(cell1.getStringCellValue()))){
+                    break;
+                }
                 dto.setName(StrUtil.trim(cell1.getStringCellValue()));
                 Cell cell2=row.getCell(2);
                 dto.setValue(StrUtil.trim(dataFormatter.formatCellValue(cell2)));
@@ -685,7 +688,7 @@ public class ProductModelController extends ControllerBase{
                                 .setCreateBy(AdminUserUtil.getUserName())
                                 .setCreateTime(LocalDateTime.now());
                         if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) {
-                            ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get();
+                            ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getBatchNumber(), cn.getBatchNumber()) && StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get();
                             item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode()));
                             item.setName(translate.translateWord(en.getName(), language.getTranslateCode()));
                             item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode()));
@@ -739,7 +742,7 @@ public class ProductModelController extends ControllerBase{
                                     .setCreateBy(AdminUserUtil.getUserName())
                                     .setCreateTime(LocalDateTime.now());
                             if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) {
-                                ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get();
+                                ProductModelParamsItem en = items.stream().filter(it ->StrUtil.equals(it.getBatchNumber(), cn.getBatchNumber()) && StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get();
                                 item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode()));
                                 item.setName(translate.translateWord(en.getName(), language.getTranslateCode()));
                                 item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode()));
diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
index 10f27903..da5972ad 100644
--- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
+++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
@@ -57,34 +57,8 @@ public class AppController extends ControllerBase {
      */
     @GetMapping("login")
     public ApiResult<AppLoginVO> login(String userName, String password) {
-        AdminUser adminUser =adminUserService.getUser(userName,password);
-        if (Objects.nonNull(adminUser)){
-            VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.Disabled.getState()))
-                    .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage()));
-            VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState()))
-                    .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED, MultilingualUtil.getLanguage()));
-            List<RoleVO> roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId());
-            SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig
-                    .setExtra("from", Constant.FROM_ADMIN)
-                    .setExtra("name", adminUser.getUserName())
-                    .setExtra("code", adminUser.getUserCode())
-                    .setExtra("email", adminUser.getEmail())
-                    .setExtra("roles", roleCodes.stream().map(RoleVO::getCode).collect(Collectors.toList())));
-            String adminToken=SaTokenAdminUtil.getTokenInfo().getTokenValue();
-            SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig
-                    .setExtra("from", Constant.FROM_ADMIN)
-                    .setExtra("name", adminUser.getUserName())
-                    .setExtra("email", adminUser.getEmail()));
-            SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo();
-            return ApiResult.success(new AppLoginVO()
-                    .setUserId(adminUser.getId())
-                    .setToken(tokenInfo.getTokenValue())
-                    .setAdminToken(adminToken)
-                    .setExpire(tokenInfo.getTokenTimeout())
-                    .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE)
-                    .setPlatform(Constant.FROM_ADMIN));
-        }else {
-            AppUser user=appUserService.getUser(userName,password);
+        AppUser user = appUserService.getUser(userName, password);
+        if (Objects.nonNull(user)) {
             VUtils.trueThrow(Objects.equals(user.getState(), UserState.Disabled.getState()))
                     .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, user.getLanguageCode()));
             VUtils.trueThrow(Objects.equals(user.getState(), UserState.ToBeActivated.getState()))
@@ -108,6 +82,32 @@ public class AppController extends ControllerBase {
                     .setExpire(tokenInfo.getTokenTimeout())
                     .setLanguageCode(user.getLanguageCode())
                     .setPlatform(Constant.FROM_APP));
+        } else {
+            AdminUser adminUser = adminUserService.getUser(userName, password);
+            VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.Disabled.getState()))
+                    .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage()));
+            VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState()))
+                    .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED, MultilingualUtil.getLanguage()));
+            List<RoleVO> roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId());
+            SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig
+                    .setExtra("from", Constant.FROM_ADMIN)
+                    .setExtra("name", adminUser.getUserName())
+                    .setExtra("code", adminUser.getUserCode())
+                    .setExtra("email", adminUser.getEmail())
+                    .setExtra("roles", roleCodes.stream().map(RoleVO::getCode).collect(Collectors.toList())));
+            String adminToken = SaTokenAdminUtil.getTokenInfo().getTokenValue();
+            SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig
+                    .setExtra("from", Constant.FROM_ADMIN)
+                    .setExtra("name", adminUser.getUserName())
+                    .setExtra("email", adminUser.getEmail()));
+            SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo();
+            return ApiResult.success(new AppLoginVO()
+                    .setUserId(adminUser.getId())
+                    .setToken(tokenInfo.getTokenValue())
+                    .setAdminToken(adminToken)
+                    .setExpire(tokenInfo.getTokenTimeout())
+                    .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE)
+                    .setPlatform(Constant.FROM_ADMIN));
         }
     }