Commit 5bed04ae authored by suhuiguang's avatar suhuiguang

1.需求2972开发,联调自测修改

parent d4db75dc
......@@ -63,7 +63,7 @@ public class UserPermissionDto {
/**
* 个人照片
*/
private JSONArray identification;
private String identification;
@JsonIgnore
private String orgCode;
......
......@@ -245,7 +245,7 @@
end as permissionStatus,
u."name",
u.certificate_num,
u.identification,
u.identification as identificationStr,
e.use_unit,
u.new_post as post,
u.sequence_nbr as uid,
......
......@@ -649,9 +649,15 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
Page<UserPermissionDto> permissionDtoPage = new Page<>(current, size);
List<String> post = this.getPostByType(type);
Page<UserPermissionDto> result = this.getBaseMapper().queryUserByPermissionPage(permissionDtoPage, post, filter);
result.getRecords().forEach(d->{
d.setIdentification(d.getIdentificationStr() != null ? JSONArray.parseArray(d.getIdentificationStr()) : null);
// 照片赋值
if (StringUtils.isNotEmpty(d.getIdentificationStr())) {
List<CommonFile> commonFiles = JSON.parseArray(d.getIdentificationStr(), CommonFile.class);
if (!ObjectUtils.isEmpty(commonFiles)) {
d.setIdentification(commonFiles.get(0).getUrl());
}
}
// 人员类型枚举转name
d.setPost(this.isJSONValid(d.getPost()) ? d.getPost() : "[\"" + d.getPost() + "\"]");
d.setPostName(this.setPostName(d.getPost()));
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment