Browse Source

fix bug:上传时MENUM类型解析报错

lijie 3 years ago
parent
commit
623bc78ace

+ 1 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java

@@ -507,7 +507,7 @@ public class AdmEquipmentController {
 							changeFlag=false;
 							continue;
 						}
-					} else if ("ENUM".equalsIgnoreCase(define.getDataType())) {
+					} else if ("ENUM".equalsIgnoreCase(define.getDataType()) || "MENUM".equalsIgnoreCase(define.getDataType())) {
 						if (CellType.NUMERIC.equals(tempCell.getCellTypeEnum())
 								&& StrUtil.isNotBlank(StrUtil.toString(CellUtil.getCellValue(tempCell,true)))) {
 							tempCell.setCellType(CellType.STRING);

+ 1 - 0
adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/service/impl/AdmModelBackServiceImpl.java

@@ -69,6 +69,7 @@ public class AdmModelBackServiceImpl implements AdmModelBackService {
 
 
 
+
         }
 
     }