|
|
@@ -193,15 +193,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
e.printStackTrace();
|
|
|
throw new BusinessException("转换异常");
|
|
|
}
|
|
|
- String str=null;
|
|
|
+
|
|
|
if (in.getUids()!=null){
|
|
|
List<String> split = Arrays.asList(in.getUids().split(","));
|
|
|
List<PublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPCid(in.getId());
|
|
|
- str=addPRD(split,prList);
|
|
|
+ addPRD(split,prList);
|
|
|
deletePRD(split,prList);
|
|
|
}
|
|
|
+ String userNames=publicReleaseDetailsMapper.getNamesByPrid(in.getId());
|
|
|
PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),null,in.getReason(),date);
|
|
|
-
|
|
|
+ in.setUserNames(userNames);
|
|
|
if(in.getStatus()==null||in.getStatus()!=3) {
|
|
|
in.setStatus(1);
|
|
|
log.setStatus(PublicReleaseLog.states.xg.getCode());
|
|
|
@@ -209,7 +210,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
//新增修改日志
|
|
|
//重新发起
|
|
|
- addPublicReleaseLog(my,in,str,date);
|
|
|
+ addPublicReleaseLog(my,in,in.getUserNames(),date);
|
|
|
}else {
|
|
|
List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
|
|
|
List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
|
|
|
@@ -245,8 +246,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private String addPRD(List<String> split, List<PublicReleaseDetails> prdList) {
|
|
|
- StringBuffer str=new StringBuffer();
|
|
|
+ private void addPRD(List<String> split, List<PublicReleaseDetails> prdList) {
|
|
|
List<PublicReleaseDetails> addPrdList=new ArrayList<>();
|
|
|
for (String s : split) {
|
|
|
boolean flag=true;
|
|
|
@@ -260,7 +260,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (flag){
|
|
|
PublicReleaseDetails prd=new PublicReleaseDetails();
|
|
|
User u=userMapper.selectByPrimaryKey(s);
|
|
|
- str.append(u.getNickname()).append(",");
|
|
|
if (u!=null&&u.getShareType()==2){
|
|
|
prd.setNewUser(1);
|
|
|
}else {
|
|
|
@@ -273,7 +272,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
if (!addPrdList.isEmpty())publicReleaseDetailsMapper.insertBatch(addPrdList);
|
|
|
- return str.substring(0,str.length()-1);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|