|
@@ -620,7 +620,7 @@ public class SysImplementPlanManager {
|
|
|
|
|
|
// 获取商品列表
|
|
|
Integer deptId = user.getDeptId();
|
|
|
- List<Map<String, String>> drugs = drugEntDrugtableService.listDrugs(Collections.singletonList(deptId));
|
|
|
+ List<Map<String, String>> drugs = drugEntDrugtableService.listDrugByDeptId(Collections.singletonList(deptId));
|
|
|
|
|
|
// 获取代理商
|
|
|
Map<String, SysDept> deptMap = deptService.list(Wrappers.<SysDept>lambdaQuery()
|
|
@@ -631,6 +631,7 @@ public class SysImplementPlanManager {
|
|
|
// 校验表单信息
|
|
|
Map<String, String> errorMap = checkDataOnBatchCreate(resource, drugs, deptMap, deptId);
|
|
|
if (CollUtil.isNotEmpty(errorMap)) {
|
|
|
+ log.info("错误信息:{}", errorMap);
|
|
|
return errorMap;
|
|
|
}
|
|
|
|
|
@@ -802,7 +803,7 @@ public class SysImplementPlanManager {
|
|
|
}
|
|
|
|
|
|
|
|
|
- if (StrUtil.isBlank(errorMsg)) {
|
|
|
+ if (StrUtil.isNotBlank(errorMsg)) {
|
|
|
errorMap.put("idx", String.valueOf(i + 1));
|
|
|
errorMap.put("errorMsg", errorMsg.toString());
|
|
|
}
|