Skip to content

A
amos-boot-biz
Commit 59540abe authored by tangwei's avatar tangwei
Browse files
Options

修改bug

parent 502da93e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @ 59540abe
...@@ -800,8 +800,8 @@ public class ExcelServiceImpl { ...@@ -800,8 +800,8 @@ public class ExcelServiceImpl {
if (orgUsrExcelDto.getAmosOrgCode() != null) { if (orgUsrExcelDto.getAmosOrgCode() != null) {
String[] certificates = orgUsrExcelDto.getAmosOrgCode().split("@"); String[] certificates = orgUsrExcelDto.getAmosOrgCode().split("@");
orgUsrExcelDto.setAmosOrgId(certificates[1]); orgUsrExcelDto.setAmosOrgId(certificates[0]);
orgUsrExcelDto.setAmosOrgCode(certificates[0]); orgUsrExcelDto.setAmosOrgCode(certificates[1]);
} }
// 动态字段填充 // 动态字段填充
...@@ -2016,6 +2016,7 @@ public class ExcelServiceImpl { ...@@ -2016,6 +2016,7 @@ public class ExcelServiceImpl {
detailList.add(o.getUserName()); detailList.add(o.getUserName());
detailList.add(o.getPostTypeName()); detailList.add(o.getPostTypeName());
detailList.add(o.getFirstAid()); detailList.add(o.getFirstAid());
detailList.add(o.getDutyArea());
List<DutyPersonShiftDto> dutyShift = o.getDutyShift(); List<DutyPersonShiftDto> dutyShift = o.getDutyShift();
initDutyShift(dayByMonth, dutyShift, detailList); initDutyShift(dayByMonth, dutyShift, detailList);
data.add(detailList); data.add(detailList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment