|
@@ -446,7 +446,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
list =new ArrayList<>(Arrays.asList(use.getAssistantAid().split(",")));
|
|
list =new ArrayList<>(Arrays.asList(use.getAssistantAid().split(",")));
|
|
|
List<PublicRelease> deletelist = publicReleaseMapper.selectByMainId(use.getId(),4,null);
|
|
List<PublicRelease> deletelist = publicReleaseMapper.selectByMainId(use.getId(),4,null);
|
|
|
for (PublicRelease p : deletelist) {
|
|
for (PublicRelease p : deletelist) {
|
|
|
- if (p.getStatus()==3){
|
|
|
|
|
boolean flag=false;
|
|
boolean flag=false;
|
|
|
for (String s : list) {
|
|
for (String s : list) {
|
|
|
if (p.getAid().equals(s)){
|
|
if (p.getAid().equals(s)){
|
|
@@ -455,12 +454,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if (flag){
|
|
if (flag){
|
|
|
- if (use.getUid().equals(p.getUid()))p.setUid(use.getUid());
|
|
|
|
|
- if (use.getUserName().equals(p.getUserName())){
|
|
|
|
|
|
|
+ if (!use.getUid().equals(p.getUid()))p.setUid(use.getUid());
|
|
|
|
|
+ if (!use.getUserName().equals(p.getUserName())){
|
|
|
p.setUserName(use.getUserName());
|
|
p.setUserName(use.getUserName());
|
|
|
p.setLatitude(use.getLatitude());
|
|
p.setLatitude(use.getLatitude());
|
|
|
p.setLongitude(use.getLongitude());
|
|
p.setLongitude(use.getLongitude());
|
|
|
}
|
|
}
|
|
|
|
|
+ if(!use.getReleaseStart().equals(p.getReleaseStart()))p.setReleaseStart(use.getReleaseStart());
|
|
|
|
|
+ if (!use.getReleaseEnd().equals(p.getReleaseEnd()))p.setReleaseEnd(use.getReleaseEnd());
|
|
|
p.setStatus(2);
|
|
p.setStatus(2);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了").append("[").append(u.getUsername()).append("]。");
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了").append("[").append(u.getUsername()).append("]。");
|
|
@@ -468,7 +469,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
sendNoticeAndSoucket(p.getAid(),p.getStatus(),str.toString());
|
|
sendNoticeAndSoucket(p.getAid(),p.getStatus(),str.toString());
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|