|
|
@@ -1,6 +1,7 @@
|
|
|
package com.goafanti.copyright.controller;
|
|
|
|
|
|
|
|
|
+import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
@@ -227,11 +228,12 @@ public class CopyrightApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
List<CopyrightLogBo> list = copyrightInfoService.findLogsByPrimaryKey(id);
|
|
|
- for (CopyrightLogBo log : list) {
|
|
|
- if (CopyrightStatus.getStatus(log.getStatus()) == CopyrightStatus.SIGN
|
|
|
- || CopyrightStatus.getStatus(log.getStatus()) == CopyrightStatus.CIRCULATION
|
|
|
- || CopyrightStatus.getStatus(log.getStatus()) == CopyrightStatus.SETTLEMENT) {
|
|
|
- list.remove(log);
|
|
|
+ for (Iterator<CopyrightLogBo> log = list.iterator() ; log.hasNext();) {
|
|
|
+ Integer status = log.next().getStatus();
|
|
|
+ if (CopyrightStatus.getStatus(status) == CopyrightStatus.SIGN
|
|
|
+ || CopyrightStatus.getStatus(status) == CopyrightStatus.CIRCULATION
|
|
|
+ || CopyrightStatus.getStatus(status) == CopyrightStatus.SETTLEMENT) {
|
|
|
+ log.remove();
|
|
|
}
|
|
|
}
|
|
|
res.setData(list);
|