Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
5bed04ae
Commit
5bed04ae
authored
Aug 28, 2024
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.需求2972开发,联调自测修改
parent
d4db75dc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
UserPermissionDto.java
...in/amos/boot/module/common/api/dto/UserPermissionDto.java
+1
-1
TzsUserInfoMapper.xml
...e-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml
+1
-1
TzsUserInfoServiceImpl.java
...t/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
+8
-2
No files found.
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserPermissionDto.java
View file @
5bed04ae
...
...
@@ -63,7 +63,7 @@ public class UserPermissionDto {
/**
* 个人照片
*/
private
JSONArray
identification
;
private
String
identification
;
@JsonIgnore
private
String
orgCode
;
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml
View file @
5bed04ae
...
...
@@ -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,
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
View file @
5bed04ae
...
...
@@ -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
()));
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment