Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
81f5c398
authored
Nov 08, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:子女端显示问题
parent
808f26d0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
View file @
81f5c398
...
@@ -25,6 +25,7 @@ import com.makeit.utils.data.convert.BeanDtoVoUtils;
...
@@ -25,6 +25,7 @@ import com.makeit.utils.data.convert.BeanDtoVoUtils;
import
com.makeit.utils.data.convert.PageUtil
;
import
com.makeit.utils.data.convert.PageUtil
;
import
com.makeit.utils.data.convert.StreamUtil
;
import
com.makeit.utils.data.convert.StreamUtil
;
import
com.makeit.utils.old.StringUtils
;
import
com.makeit.utils.old.StringUtils
;
import
com.makeit.utils.request.RequestUtil
;
import
com.makeit.utils.sql.join.JoinUtil
;
import
com.makeit.utils.sql.join.JoinUtil
;
import
com.makeit.utils.user.common.CommonUserUtil
;
import
com.makeit.utils.user.common.CommonUserUtil
;
import
com.makeit.utils.user.common.CommonUserVO
;
import
com.makeit.utils.user.common.CommonUserVO
;
...
@@ -58,10 +59,12 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
...
@@ -58,10 +59,12 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
private
PlatOrgService
platOrgService
;
private
PlatOrgService
platOrgService
;
private
LambdaQueryWrapper
<
PlatElderChildrenInfo
>
lambdaQueryWrapper
(
PlatElderChildrenInfoQueryDTO
dto
)
{
private
LambdaQueryWrapper
<
PlatElderChildrenInfo
>
lambdaQueryWrapper
(
PlatElderChildrenInfoQueryDTO
dto
)
{
return
new
QueryWrapper
<
PlatElderChildrenInfo
>().
lambda
()
return
new
QueryWrapper
<
PlatElderChildrenInfo
>().
lambda
()
.
like
(
StringUtils
.
isNotBlank
(
dto
.
getName
()),
PlatElderChildrenInfo:
:
getName
,
dto
.
getName
())
.
like
(
StringUtils
.
isNotBlank
(
dto
.
getName
()),
PlatElderChildrenInfo:
:
getName
,
dto
.
getName
())
.
like
(
StringUtils
.
isNotBlank
(
dto
.
getPhone
()),
PlatElderChildrenInfo:
:
getPhone
,
dto
.
getPhone
())
.
like
(
StringUtils
.
isNotBlank
(
dto
.
getPhone
()),
PlatElderChildrenInfo:
:
getPhone
,
dto
.
getPhone
())
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getElderId
()),
PlatElderChildrenInfo:
:
getElderId
,
dto
.
getElderId
())
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getElderId
()),
PlatElderChildrenInfo:
:
getElderId
,
dto
.
getElderId
())
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getTenantId
()),
PlatElderChildrenInfo:
:
getTenantId
,
dto
.
getTenantId
())
.
apply
(
StringUtils
.
isNotBlank
(
dto
.
getOrgId
()),
"find_in_set('"
+
dto
.
getOrgId
()
+
"',org_path)"
);
.
apply
(
StringUtils
.
isNotBlank
(
dto
.
getOrgId
()),
"find_in_set('"
+
dto
.
getOrgId
()
+
"',org_path)"
);
}
}
...
@@ -85,6 +88,9 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
...
@@ -85,6 +88,9 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
PlatElderChildrenInfoQueryDTO
dto
=
page
.
getData
();
PlatElderChildrenInfoQueryDTO
dto
=
page
.
getData
();
Page
<
PlatElderChildrenInfo
>
p
=
PageUtil
.
toMpPage
(
page
);
Page
<
PlatElderChildrenInfo
>
p
=
PageUtil
.
toMpPage
(
page
);
String
tenantId
=
RequestUtil
.
getTenantIdHeader
();
dto
.
setTenantId
(
tenantId
);
Page
<
PlatElderChildrenInfo
>
voPage
=
page
(
p
,
lambdaQueryWrapper
(
dto
));
Page
<
PlatElderChildrenInfo
>
voPage
=
page
(
p
,
lambdaQueryWrapper
(
dto
));
List
<
PlatElderChildrenInfoListVO
>
voList
=
BeanDtoVoUtils
.
listVo
(
voPage
.
getRecords
(),
PlatElderChildrenInfoListVO
.
class
);
List
<
PlatElderChildrenInfoListVO
>
voList
=
BeanDtoVoUtils
.
listVo
(
voPage
.
getRecords
(),
PlatElderChildrenInfoListVO
.
class
);
...
@@ -97,6 +103,8 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
...
@@ -97,6 +103,8 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
@Override
@Override
public
List
<
PlatElderChildrenInfoListVO
>
list
(
PlatElderChildrenInfoQueryDTO
dto
)
{
public
List
<
PlatElderChildrenInfoListVO
>
list
(
PlatElderChildrenInfoQueryDTO
dto
)
{
String
tenantId
=
RequestUtil
.
getTenantIdHeader
();
dto
.
setTenantId
(
tenantId
);
List
<
PlatElderChildrenInfo
>
list
=
list
(
lambdaQueryWrapper
(
dto
));
List
<
PlatElderChildrenInfo
>
list
=
list
(
lambdaQueryWrapper
(
dto
));
List
<
PlatElderChildrenInfoListVO
>
voList
=
BeanDtoVoUtils
.
listVo
(
list
,
PlatElderChildrenInfoListVO
.
class
);
List
<
PlatElderChildrenInfoListVO
>
voList
=
BeanDtoVoUtils
.
listVo
(
list
,
PlatElderChildrenInfoListVO
.
class
);
...
...
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