|
|
@@ -39,7 +39,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
@Autowired
|
|
|
private OrgIntellectualPropertyMapper orgIntellectualPropertyMapper;
|
|
|
@Autowired
|
|
|
- private NoticeMapper noticeMapper;
|
|
|
+ private NoticeMapper noticeMapper;
|
|
|
|
|
|
@Override
|
|
|
public CopyrightInfo insert(CopyrightInfo copyrightInfo) {
|
|
|
@@ -64,9 +64,9 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
if (copyrightLog.getRecordTime() != null && copyrightLog.getStatus() != null
|
|
|
&& copyrightLog.getPrincipal() != null) {
|
|
|
copyrightLogMapper.insertSelective(copyrightLog);
|
|
|
-
|
|
|
+
|
|
|
createNotice(copyrightInfo, copyrightLog);
|
|
|
-
|
|
|
+
|
|
|
if (CopyrightStatus.getStatus(copyrightLog.getStatus()) == CopyrightStatus.ACCEPT) {
|
|
|
copyrightInfo.setAcceptTime(copyrightLog.getRecordTime());
|
|
|
} else if (CopyrightStatus.getStatus(copyrightLog.getStatus()) == CopyrightStatus.DELIVERD) {
|
|
|
@@ -120,8 +120,8 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime, Integer pageNo,
|
|
|
Integer pageSize, String uid) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
-
|
|
|
- if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
+
|
|
|
+ if (TokenManager.getAdminToken() != null && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
params.put("principal", TokenManager.getAdminId());
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(province)) {
|
|
|
@@ -197,8 +197,8 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
|
|
|
public void updateByPrimaryKey(CopyrightInfo copyrightInfo) {
|
|
|
copyrightInfoMapper.updateByPrimaryKey(copyrightInfo);
|
|
|
}
|
|
|
-
|
|
|
- private void createNotice(CopyrightInfo c, CopyrightLog l){
|
|
|
+
|
|
|
+ private void createNotice(CopyrightInfo c, CopyrightLog l) {
|
|
|
CopyrightInfo info = copyrightInfoMapper.selectByPrimaryKey(c.getId());
|
|
|
Notice n = new Notice();
|
|
|
Calendar now = Calendar.getInstance();
|