取消areaCode相关插入

rain

2026-01-13 631b1895a9a12ceace45fcd877d3f4e6fbf0885f

取消areaCode相关插入

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java

@@ -111,19 +111,19 @@
                deptId = null;
            }
        }
        String areaCode = fwAreaDivide.getAreaCode();
        if (StringUtil.isBlank(areaCode)) {
            areaCode = HeaderUtils.getAreaCode();
        }
//        String areaCode = fwAreaDivide.getAreaCode();
//        if (StringUtil.isBlank(areaCode)) {
//            areaCode = HeaderUtils.getAreaCode();
//        }
        Date now = new Date();
        fwAreaDivide.setCreateUser(userId);
        fwAreaDivide.setUpdateUser(userId);
        if (deptId != null) {
            fwAreaDivide.setCreateDept(deptId);
        }
        if (StringUtil.isNotBlank(areaCode)) {
            fwAreaDivide.setAreaCode(areaCode);
        }
//        if (StringUtil.isNotBlank(areaCode)) {
//            fwAreaDivide.setAreaCode(areaCode);
//        }
        fwAreaDivide.setCreateTime(now);
        fwAreaDivide.setUpdateTime(now);
    }

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java

@@ -221,19 +221,19 @@
                deptId = null;
            }
        }
        String areaCode = HeaderUtils.getAreaCode();
        if (StringUtil.isBlank(areaCode)) {
            areaCode = fwDefenseScene.getAreaCode();
        }
//        String areaCode = HeaderUtils.getAreaCode();
//        if (StringUtil.isBlank(areaCode)) {
//            areaCode = fwDefenseScene.getAreaCode();
//        }
        Date now = new Date();
        fwDefenseScene.setCreateUser(userId);
        fwDefenseScene.setUpdateUser(userId);
        if (deptId != null) {
            fwDefenseScene.setCreateDept(deptId);
        }
        if (StringUtil.isNotBlank(areaCode)) {
            fwDefenseScene.setAreaCode(areaCode);
        }
//        if (StringUtil.isNotBlank(areaCode)) {
//            fwDefenseScene.setAreaCode(areaCode);
//        }
        fwDefenseScene.setCreateTime(now);
        fwDefenseScene.setUpdateTime(now);
    }

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java

@@ -221,19 +221,19 @@
                deptId = null;
            }
        }
        String areaCode = HeaderUtils.getAreaCode();
        if (StringUtil.isBlank(areaCode)) {
            areaCode = fwDefenseZone.getAreaCode();
        }
//        String areaCode = HeaderUtils.getAreaCode();
//        if (StringUtil.isBlank(areaCode)) {
//            areaCode = fwDefenseZone.getAreaCode();
//        }
        Date now = new Date();
        fwDefenseZone.setCreateUser(userId);
        fwDefenseZone.setUpdateUser(userId);
        if (deptId != null) {
            fwDefenseZone.setCreateDept(deptId);
        }
        if (StringUtil.isNotBlank(areaCode)) {
            fwDefenseZone.setAreaCode(areaCode);
        }
//        if (StringUtil.isNotBlank(areaCode)) {
//            fwDefenseZone.setAreaCode(areaCode);
//        }
        fwDefenseZone.setCreateTime(now);
        fwDefenseZone.setUpdateTime(now);
    }