修改区域批量更新

agent-manager/src/main/java/com/mortals/xhx/module/base/service/impl/BaseAreaServiceImpl.java

@@ -105,23 +105,17 @@ public class BaseAreaServiceImpl extends AbstractCRUDServiceImpl<BaseAreaDao, Ba
         Rest<RootAreaInfo> ret = JSON.parseObject(rest, new TypeReference<Rest<RootAreaInfo>>() {
         });
 
-
         if (200 == ret.getCode()) {
             GroupAreaInfo group = ret.getData().getGroup();
 
             //查询当前group是否存在 存在 更新数据
-            BaseAreaQuery baseAreaQuery = new BaseAreaQuery();
-            baseAreaQuery.setAreaCode(group.getAreaCode());
-            BaseAreaEntity entity = updateAndSaveEntity(baseAreaQuery, group);
+            BaseAreaEntity entity = updateAndSaveEntity( group);
             list.add(entity);
 
             List<GroupAreaInfo> sonAreas = group.getSonAreas();
             for (GroupAreaInfo sonArea : sonAreas) {
-                //
-                baseAreaQuery = new BaseAreaQuery();
-                baseAreaQuery.setAreaCode(sonArea.getAreaCode());
-                entity = updateAndSaveEntity(baseAreaQuery, sonArea);
-                list.add(entity);
+ /*               entity = updateAndSaveEntity(sonArea);
+                list.add(entity);*/
                 updateArea(new BaseAreaQuery().areaCode(sonArea.getAreaCode()),list, context);
             }
         }
@@ -130,7 +124,7 @@ public class BaseAreaServiceImpl extends AbstractCRUDServiceImpl<BaseAreaDao, Ba
         return Rest.ok();
     }
 
-    private BaseAreaEntity updateAndSaveEntity(BaseAreaQuery baseAreaQuery, GroupAreaInfo group) {
+    private BaseAreaEntity updateAndSaveEntity( GroupAreaInfo group) {
         BaseAreaEntity entity = new BaseAreaEntity();
         entity.initAttrValue();
         BeanUtils.copyProperties(group, entity, BeanUtil.getNullPropertyNames(group));