|
|
@@ -115,8 +115,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
StringBuffer sb=new StringBuffer();
|
|
|
for (String s : ss) {
|
|
|
Admin a=adminMapper.selectByPrimaryKey(s);
|
|
|
- sb=sb.append(a.getName()).append(",");
|
|
|
+ if (a!=null&&a.getName()!=null)sb=sb.append(a.getName()).append(",");
|
|
|
}
|
|
|
+ if (sb.length()<1)return "";
|
|
|
return sb.deleteCharAt(sb.length() - 1).toString();
|
|
|
}
|
|
|
|
|
|
@@ -168,6 +169,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
log.setStatus(PublicReleaseLog.states.cx.getCode());
|
|
|
}
|
|
|
in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
+
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
return publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
}
|