Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

3 years ago · 65c5a18edc
1 changed files with 2 additions and 0 deletions
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/DeptExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/DeptExcelImportListener.java
@ -59,6 +59,8 @@ public class DeptExcelImportListener implements ReadListener<DeptImportExcelDTO>
            entity.setUpdatedBy(staffId);
            entity.setTotalUser(NumConstant.ZERO);
            entity.setAreaCode(StringUtils.isNotBlank(agencyEntity.getAreaCode())?agencyEntity.getAreaCode(): StrConstant.EPMETY_STR);
+            entity.setDepartmentDuty(StrConstant.EPMETY_STR);
+            entity.setDeptType("duty");
            insertDatas.add(entity);
            if (insertDatas.size() == MAX_THRESHOLD) {
                execPersist();