添加自定义导入

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -2063,11 +2063,8 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         //内部先去重复
         list = list.stream().distinct().collect(Collectors.toList());
         int SucessCount = 0;
-
         int failCount = 0;
-
         for (MatterCustomImportEntity matterCustomImportEntity : list) {
-
             if (ObjectUtils.isEmpty(matterCustomImportEntity.getAreaCode())) {
                 failCount++;
                 continue;
@@ -2088,40 +2085,34 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                 matterEntity.setCreateUserId(1L);
                 this.save(matterEntity);
 
+
+                SiteEntity siteEntity = siteService.selectOne(new SiteQuery().areaCode(matterEntity.getAreaCode()));
+                if (ObjectUtils.isEmpty(siteEntity)) {
+                    //创建一个本级站点
+                    siteEntity = new SiteEntity();
+                    siteEntity.initAttrValue();
+                    siteEntity.setAreaCode(matterEntity.getAreaCode());
+                    siteEntity.setAreaName(matterEntity.getAreaName());
+                    siteEntity.setSiteName(matterEntity.getAreaName());
+
+                    siteEntity.setCreateTime(new Date());
+                    siteEntity.setCreateUserId(1L);
+                    siteService.save(siteEntity);
+                }
+
                 //保存区域站点部门
-                DeptEntity deptEntity = deptService.selectOne(new DeptQuery().name(matterEntity.getDeptName()));
+                DeptEntity deptEntity = deptService.selectOne(new DeptQuery().siteId(siteEntity.getId()).name(matterEntity.getDeptName()));
                 if (ObjectUtils.isEmpty(deptEntity)) {
                     deptEntity = new DeptEntity();
                     deptEntity.initAttrValue();
                     deptEntity.setName(matterEntity.getDeptName());
                     deptEntity.setDeptNumber(RandomUtil.randomString(12));
-
-                    SiteEntity siteEntity = siteService.selectOne(new SiteQuery().areaCode(matterEntity.getAreaCode()));
-                    if (!ObjectUtils.isEmpty(siteEntity)) {
-                        deptEntity.setSiteId(siteEntity.getId());
-                    } else {
-                        //创建一个本级站点
-                        siteEntity = new SiteEntity();
-                        siteEntity.initAttrValue();
-                        siteEntity.setAreaCode(matterEntity.getAreaCode());
-                        siteEntity.setAreaName(matterEntity.getAreaName());
-                        siteEntity.setSiteName(matterEntity.getAreaName());
-
-                        siteEntity.setCreateTime(new Date());
-                        siteEntity.setCreateUserId(1L);
-                        siteService.save(siteEntity);
-                        deptEntity.setSiteId(siteEntity.getId());
-                    }
-
+                    deptEntity.setSiteId(siteEntity.getId());
                     deptEntity.setCreateTime(new Date());
                     deptEntity.setCreateUserId(1L);
-
                     deptService.save(deptEntity);
-
-
                     matterEntity.setDeptCode(deptEntity.getDeptNumber());
                     this.update(matterEntity);
-
                 }