|
@@ -524,7 +524,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
|
|
|
// 添加到多Sheet数据
|
|
|
multiSheetList[deptIndex] = body;
|
|
|
- sheetsName[deptIndex] = department.getDepartmentName()+"_"+(deptIndex+1);
|
|
|
+ if (wxCorpInfo != null) {
|
|
|
+ sheetsName[deptIndex] ="$departmentName="+(department.getCorpwxDeptid()==null?"":department.getCorpwxDeptid())+"$"+"_"+(deptIndex+1); //避免sheet名称重复
|
|
|
+ } else {
|
|
|
+ sheetsName[deptIndex] = (StringUtils.isEmpty(department.getDepartmentName())?"":department.getDepartmentName())+"_"+(deptIndex+1);//避免sheet名称重复
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|