分部、部门、人员封存后取消架构图展示

src/com/engine/organization/service/impl/VersionManageServiceImpl.java

@@ -80,10 +80,12 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                 List<HrmSubCompanyVersion> list = getCompanyVersionMapper().getSubComVersionList(operateName,operateTime,supComId,null);
                 List versions = new ArrayList<>();
                 Map<String,String> map = new HashMap<>();
-                for (HrmSubCompanyVersion hrmSubCompanyVersion:list){
-                    map.put("value", String.valueOf(hrmSubCompanyVersion.getVersion()));
-                    versions.add(map);
+                for (int i=0;i<list.size();i++){
+                    HrmSubCompanyVersion hrmSubCompanyVersion = list.get(i);
+                    String value = "value" + i;
+                    map.put(value,  String.format("%.1f", hrmSubCompanyVersion.getVersion()));
                 }
+                versions.add(map);
                 List<HrmSubCompanyVersion> list2 = getCompanyVersionMapper().getSubComVersionList(operateName,operateTime,supComId,id);
 //                List datas = new ArrayList<>();
 //                Map<String,String> map2 = new HashMap<>();
@@ -143,8 +145,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
 
         getJclOrgMapMapper().deleteMap("1", id, jclOrgMap.getFDateBegin());
         getJclOrgMapMapper().updateMap("1", id, jclOrgMap.getFDateBegin(), time);
-
-        getJclOrgMapMapper().insertMap(jclOrgMap);
+        if(!params.getString("canceled").equals("1")){
+            getJclOrgMapMapper().insertMap(jclOrgMap);
+        }
     }
 
     /**
@@ -198,7 +201,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
 
         getJclOrgMapMapper().deleteMap("2", id, jclOrgMap.getFDateBegin());
         getJclOrgMapMapper().updateMap("2", id, jclOrgMap.getFDateBegin(), time);
-        getJclOrgMapMapper().insertMap(jclOrgMap);
+        if(!params.getString("canceled").equals("1")){
+            getJclOrgMapMapper().insertMap(jclOrgMap);
+        }
     }
 
 
@@ -243,7 +248,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
         getJclOrgMapMapper().deleteMap("4", id, jclOrgMap.getFDateBegin());
         getJclOrgMapMapper().updateMap("4", id, jclOrgMap.getFDateBegin(), time);
 
-        getJclOrgMapMapper().insertMap(jclOrgMap);
+        if(!params.getString("canceled").equals("1")){
+            getJclOrgMapMapper().insertMap(jclOrgMap);
+        }
 
     }