调整机构

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysOrgExtend.java

@@ -157,6 +157,7 @@ public class SysOrgExtend extends BaseEntity {
      * 机构id
      */
     @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
     @ApiModelProperty(value = "建设时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgExtendServiceImpl.java

@@ -151,6 +151,7 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
         if (sysOrgExtend.getConstructionList() != null && sysOrgExtend.getConstructionList().size() > 0) {
             for (SysPhysicalDefenseConstruction s :
                     sysOrgExtend.getConstructionList()) {
+                s.setId(null);
 //                if (s.getOrgId() == null) {
                     s.setOrgId(org.getId());
                     s.setCreateTime(DateUtils.getNowDate());