提交 d2480c3a authored 作者: renjiancai's avatar renjiancai

--no commit message

上级 9e7cc829
...@@ -156,7 +156,6 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin ...@@ -156,7 +156,6 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
Example example=userRelationService.createExample(); Example example=userRelationService.createExample();
example.createCriteria().andEqualTo("objectId", form.getObjetcId()).andEqualTo("userId", form.getUserId().get(i)); example.createCriteria().andEqualTo("objectId", form.getObjetcId()).andEqualTo("userId", form.getUserId().get(i));
List<SignLanguageUserRelation> list = userRelationMapper.selectByExample(example); List<SignLanguageUserRelation> list = userRelationMapper.selectByExample(example);
if(list.size() <= 0) {
SignLanguageUserRelation userRelation = new SignLanguageUserRelation(); SignLanguageUserRelation userRelation = new SignLanguageUserRelation();
userRelation.setUserId(form.getUserId().get(i)); userRelation.setUserId(form.getUserId().get(i));
userRelation.setUserName(form.getUserName().get(i)); userRelation.setUserName(form.getUserName().get(i));
...@@ -184,7 +183,6 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin ...@@ -184,7 +183,6 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
relation.setUserId(form.getUserId().get(i)); relation.setUserId(form.getUserId().get(i));
relation.setUserType(userType); relation.setUserType(userType);
signLanguageRelationMapper.insert(relation); signLanguageRelationMapper.insert(relation);
}
} }
// 状态 1待分发 2已分发 3审核中 4审核通过 5审核未通过 // 状态 1待分发 2已分发 3审核中 4审核通过 5审核未通过
if(userType.equals(UserTypeEnum.TYPE_2.getCode())) { if(userType.equals(UserTypeEnum.TYPE_2.getCode())) {
......
...@@ -123,7 +123,11 @@ public class FgContributeController { ...@@ -123,7 +123,11 @@ public class FgContributeController {
vo.setUserType_2("区域管理员"); vo.setUserType_2("区域管理员");
User user=fgUserService.selectByPrimaryKey(contributeRelation.getUserId()); User user=fgUserService.selectByPrimaryKey(contributeRelation.getUserId());
if(user!=null) { if(user!=null) {
vo.setImage_1(user.getImg()); List<String> fileNameList = Arrays.asList(user.getImg());
CallBack<List<String>> result = fileInfoClient.getFilePath(fileNameList);
if (result.hasEntity() && ArrayUtils.isNotEmpty(result.getData())) {
vo.setImage_2(result.getData().get(0));
}
} }
}else if(contributeRelation.getUserType().equals(UserTypeEnum.TYPE_2.getCode())){ }else if(contributeRelation.getUserType().equals(UserTypeEnum.TYPE_2.getCode())){
vo.setOpinion_1(contributeRelation.getOpinion()); vo.setOpinion_1(contributeRelation.getOpinion());
...@@ -131,7 +135,11 @@ public class FgContributeController { ...@@ -131,7 +135,11 @@ public class FgContributeController {
vo.setUserType_1("中心管理员"); vo.setUserType_1("中心管理员");
User user=fgUserService.selectByPrimaryKey(contributeRelation.getUserId()); User user=fgUserService.selectByPrimaryKey(contributeRelation.getUserId());
if(user!=null) { if(user!=null) {
vo.setImage_2(user.getImg()); List<String> fileNameList = Arrays.asList(user.getImg());
CallBack<List<String>> result = fileInfoClient.getFilePath(fileNameList);
if (result.hasEntity() && ArrayUtils.isNotEmpty(result.getData())) {
vo.setImage_2(result.getData().get(0));
}
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论