|
@@ -683,13 +683,11 @@ public class ZhcxItpTemplateNodesServiceImpl extends ServiceImpl<ZhcxItpTemplate
|
|
|
String machineid = (String) map.get("machineid");
|
|
|
// 获取模板信息
|
|
|
ZhcxTempExport tempExport = baseMapper.getFileIdByCes("CES");
|
|
|
- if(ObjectUtil.isNull(tempExport) || ObjectUtil.isNotEmpty(tempExport.getFileId())) {
|
|
|
+ if(ObjectUtil.isNull(tempExport) || ObjectUtil.isEmpty(tempExport.getFileId())) {
|
|
|
return R.error("获取word模板失败");
|
|
|
}
|
|
|
- // 序号
|
|
|
- //String serialNumbers = tempExport.getValued();
|
|
|
SysFileItemDo fileItemDo = sysFileItemService.getById(tempExport.getFileId().split("-;-")[1]);
|
|
|
- if(Objects.isNull(fileItemDo) || ObjectUtil.isNotEmpty(fileItemDo.getFullpath())) {
|
|
|
+ if(Objects.isNull(fileItemDo) || ObjectUtil.isEmpty(fileItemDo.getFullpath())) {
|
|
|
return R.error("获取word模板失败");
|
|
|
}
|
|
|
// word参数值
|