|
@@ -440,7 +440,7 @@ public class BatchController {
|
|
|
* 获取人群包接口
|
|
|
*
|
|
|
* @param accountId
|
|
|
- * @return
|
|
|
+ * @returnBatch
|
|
|
*/
|
|
|
@GetMapping(value = "/getPopulationList")
|
|
|
public Result<JSONArray> getAppList(Long accountId) {
|
|
@@ -1559,7 +1559,15 @@ public class BatchController {
|
|
|
if (Check.isNull(group)) {
|
|
|
continue;
|
|
|
}
|
|
|
- String unitName = group.getUnitName();
|
|
|
+ String unitNameStr = group.getUnitName();
|
|
|
+ String unitName;
|
|
|
+
|
|
|
+ if (unitNameStr.contains("#")) {
|
|
|
+ int lastIndexOf = unitNameStr.lastIndexOf("#");
|
|
|
+ unitName = unitNameStr.substring(0, lastIndexOf);
|
|
|
+ } else {
|
|
|
+ unitName = unitNameStr;
|
|
|
+ }
|
|
|
group.setUnitName(unitName + RandomUtil.verifyCode());
|
|
|
JSONObject unitJson = batchService.copyUnit(group, copyToCampaignId);
|
|
|
if (!Check.isNull(unitJson)) {
|