Merge remote-tracking branch 'origin/upgrade' into upgrade

src/main/java/com/cm/population/service/correct/impl/CorrectServiceImpl.java

@@ -51,7 +51,11 @@ public class CorrectServiceImpl extends AbstractService implements ICorrectServi
         String correctId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.objectToMap(correctVO);
         params.put("correctId", correctId);
+        if(StringUtils.isEmpty(token)) {
             setSaveInfo(params);
+        }else{
+            setSaveInfo(token, params);
+        }
         correctDao.save(params);
         return correctId;
     }

src/main/java/com/cm/population/service/petition/impl/PetitionServiceImpl.java

@@ -59,7 +59,6 @@ public class PetitionServiceImpl extends AbstractService implements IPetitionSer
         }else{
             setSaveInfo(token, params);
         }
-        
         petitionDao.save(params);
         return petitionId;
     }

src/main/java/com/cm/population/service/populationinfo/impl/PopulationInfoServiceImpl.java

@@ -160,7 +160,11 @@ public class PopulationInfoServiceImpl extends AbstractService implements IPopul
         }
         Map<String, Object> params = HashMapUtil.objectToMap(populationInfoVO);
         params.put("populationInfoId", populationInfoId);
+        if(StringUtils.isEmpty(token)) {
             setSaveInfo(params);
+        }else{
+            setSaveInfo(token, params);
+        }
         populationInfoDao.save(params);//
         return populationInfoId;
     }

src/main/java/com/cm/population/service/release/impl/ReleaseServiceImpl.java

@@ -51,7 +51,11 @@ public class ReleaseServiceImpl extends AbstractService implements IReleaseServi
         String releaseId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.objectToMap(releaseVO);
         params.put("releaseId", releaseId);
+        if(StringUtils.isEmpty(token)) {
             setSaveInfo(params);
+        }else{
+            setSaveInfo(token, params);
+        }
         releaseDao.save(params);
         return releaseId;
     }