|
|
@@ -1,7 +1,6 @@
|
|
|
package com.cyksj.web.controller.manage.goods;
|
|
|
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
-import cn.hutool.core.lang.Validator;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.cyksj.common.annotation.Log;
|
|
|
@@ -161,12 +160,12 @@ public class CmsGoodsDonWholeSaleController {
|
|
|
if (StrUtil.isNotBlank(content)) {
|
|
|
String[] split = content.split("\\|");
|
|
|
String str = split[1];
|
|
|
- if (Validator.isNumber(str)) {
|
|
|
- data.setNum(Integer.parseInt(split[1]));
|
|
|
- data.setSource(split[0]);
|
|
|
+ if (str.contains("[")) {
|
|
|
+ data.setSource(str);
|
|
|
+ data.setNum(split[0]);
|
|
|
} else {
|
|
|
- data.setNum(Integer.parseInt(split[0]));
|
|
|
- data.setSource(split[1]);
|
|
|
+ data.setNum(str);
|
|
|
+ data.setSource(split[0]);
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|