Merge branch 'wxz_dim_sync' into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java

@@ -275,7 +275,7 @@ public class ScreenCustomerAgencyServiceImpl extends BaseServiceImpl<ScreenCusto
             existsOne.setLevel(e.getLevel());
             existsOne.setPid(e.getPid());
             existsOne.setPids(e.getPids());
-            existsOne.setSourceType(OrgSourceTypeConstant.INTERNAL);
+            //existsOne.setSourceType(OrgSourceTypeConstant.INTERNAL);
             existsOne.setParentAreaCode(e.getParentAreaCode());
             existsOne.setCode(e.getCode());
             screenCustomerAgencyDao.updateById(existsOne);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java

@@ -97,7 +97,7 @@ public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl<ScreenCustome
                 e.setDeptId(dept.getId());
                 e.setDeptName(dept.getDepartmentName());
                 e.setParentAgencyId(dept.getAgencyId());
-                e.setSourceType(OrgSourceTypeConstant.INTERNAL);
+                //e.setSourceType(OrgSourceTypeConstant.INTERNAL);
                 e.setAreaCode(dept.getAreaCode());
                 screenCustomerDeptDao.updateById(e);
             }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java

@@ -104,7 +104,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
                 screenGrid.setGridId(grid.getId());
                 screenGrid.setGridName(grid.getGridName());
                 screenGrid.setParentAgencyId(grid.getPid());
-                screenGrid.setSourceType(OrgSourceTypeConstant.INTERNAL);
+                //screenGrid.setSourceType(OrgSourceTypeConstant.INTERNAL);
                 screenGrid.setAreaCode(grid.getAreaCode());
                 screenGrid.setCode(grid.getCode());
                 screenCustomerGridDao.updateById(screenGrid);