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
30b633af
authored
Nov 09, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:子女段列表权限问题
parent
d2e10cbe
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
server-service/src/main/java/com/makeit/dto/platform/elder/children/PlatElderChildrenInfoQueryDTO.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
server-service/src/main/java/com/makeit/dto/platform/elder/children/PlatElderChildrenInfoQueryDTO.java
View file @
30b633af
...
...
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.List
;
/**
* <p>
* 长者子女账号
...
...
@@ -30,6 +32,8 @@ public class PlatElderChildrenInfoQueryDTO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"组织id"
)
private
String
orgId
;
@ApiModelProperty
(
value
=
"组织id集合"
)
private
List
<
String
>
orgIdList
;
}
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
View file @
30b633af
...
...
@@ -16,6 +16,7 @@ import com.makeit.entity.platform.auth.PlatOrg;
import
com.makeit.entity.platform.elder.PlatElder
;
import
com.makeit.entity.platform.elder.PlatElderChildrenInfo
;
import
com.makeit.enums.CodeMessageEnum
;
import
com.makeit.enums.Const
;
import
com.makeit.exception.BusinessException
;
import
com.makeit.mapper.platform.elder.PlatElderChildrenInfoMapper
;
import
com.makeit.service.platform.auth.PlatOrgService
;
...
...
@@ -66,6 +67,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
.
like
(
StringUtils
.
isNotBlank
(
dto
.
getPhone
()),
PlatElderChildrenInfo:
:
getPhone
,
dto
.
getPhone
())
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getElderId
()),
PlatElderChildrenInfo:
:
getElderId
,
dto
.
getElderId
())
.
eq
(
StringUtils
.
isNotBlank
(
dto
.
getTenantId
()),
PlatElderChildrenInfo:
:
getTenantId
,
dto
.
getTenantId
())
.
in
(
CollectionUtils
.
isNotEmpty
(
dto
.
getOrgIdList
()),
PlatElderChildrenInfo:
:
getOrgId
,
dto
.
getOrgIdList
())
.
apply
(
StringUtils
.
isNotBlank
(
dto
.
getOrgId
()),
"find_in_set('"
+
dto
.
getOrgId
()
+
"',org_path)"
);
}
...
...
@@ -92,6 +94,11 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
String
tenantId
=
RequestUtil
.
getTenantIdHeader
();
dto
.
setTenantId
(
tenantId
);
String
dataScope
=
RequestUtil
.
getDataScope
();
if
(
StringUtils
.
isNotBlank
(
dataScope
))
{
dto
.
setOrgIdList
(
Lists
.
newArrayList
(
dataScope
.
split
(
Const
.
COMMON_SPLIT
)));
}
LambdaQueryWrapper
<
PlatElderChildrenInfo
>
queryWrapper
=
lambdaQueryWrapper
(
dto
);
queryWrapper
.
groupBy
(
PlatElderChildrenInfo:
:
getOpenid
);
Page
<
PlatElderChildrenInfo
>
voPage
=
page
(
p
,
queryWrapper
);
...
...
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