Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
online-edu-backend
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Redmine
Redmine
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
online-edu
online-edu-backend
Commits
499d532a
Commit
499d532a
authored
Nov 01, 2021
by
liuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
企业管理列表查询时,只取一条企业所属的管理员
parent
4bddf477
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
21 deletions
+42
-21
MemberService.java
...java/com/qkdata/biz/management/service/MemberService.java
+4
-0
OrganizationService.java
...om/qkdata/biz/management/service/OrganizationService.java
+10
-0
QueryEnterpriseModel.java
...va/com/qkdata/biz/management/vo/QueryEnterpriseModel.java
+0
-1
SysUserExtMapper.java
...main/java/com/qkdata/biz/sys/mapper/SysUserExtMapper.java
+2
-0
application-prod.yml
src/main/resources/application-prod.yml
+1
-0
OrganizationPOMapper.xml
...ain/resources/mappers/management/OrganizationPOMapper.xml
+2
-20
SysUserExtMapper.xml
src/main/resources/mappers/sys/SysUserExtMapper.xml
+23
-0
No files found.
src/main/java/com/qkdata/biz/management/service/MemberService.java
View file @
499d532a
...
...
@@ -224,4 +224,8 @@ public class MemberService {
sysUserRoleService
.
saveOrUpdateUserRole
(
model
.
getId
(),
roleIds
);
}
}
public
List
<
MemberInfoModel
>
findEnterpriseAdmin
(
Long
enterpriseId
)
{
return
sysUserExtMapper
.
finfindEnterpriseAdmin
(
enterpriseId
);
}
}
src/main/java/com/qkdata/biz/management/service/OrganizationService.java
View file @
499d532a
...
...
@@ -84,6 +84,16 @@ public class OrganizationService extends BaseServiceImpl<OrganizationMapper, Org
for
(
EnterpriseListItemModel
model
:
list
){
int
count
=
memberService
.
countByEnterpriseId
(
model
.
getId
());
model
.
setMemberCount
(
count
);
List
<
MemberInfoModel
>
memberList
=
memberService
.
findEnterpriseAdmin
(
model
.
getId
());
if
(
CollUtil
.
isNotEmpty
(
memberList
)){
MemberInfoModel
memberInfo
=
memberList
.
get
(
0
);
model
.
setAdminMobile
(
memberInfo
.
getUsername
());
model
.
setAdminAvatarUrl
(
memberInfo
.
getAvatarUrl
());
model
.
setAdminNickName
(
memberInfo
.
getNickName
());
model
.
setAdminName
(
memberInfo
.
getName
());
model
.
setAdminStatus
(
memberInfo
.
getStatus
());
model
.
setLastLoginTime
(
memberInfo
.
getLastLoginTime
());
}
}
return
PageResult
.<
EnterpriseListItemModel
>
builder
().
code
(
CodeEnum
.
SUCCESS
.
getCode
()).
count
(
page
.
getTotal
()).
data
(
list
).
build
();
}
...
...
src/main/java/com/qkdata/biz/management/vo/QueryEnterpriseModel.java
View file @
499d532a
...
...
@@ -8,5 +8,4 @@ public class QueryEnterpriseModel {
private
int
pageIndex
=
Constants
.
DEFAULT_PAGE
;
private
int
pageSize
=
Constants
.
DEFAULT_PAGE_SIZE
;
private
String
enterpriseName
;
private
String
adminMobile
;
}
src/main/java/com/qkdata/biz/sys/mapper/SysUserExtMapper.java
View file @
499d532a
...
...
@@ -27,4 +27,6 @@ public interface SysUserExtMapper extends BaseMapper<SysUserExtPO> {
MemberInfoModel
getByUsername
(
String
username
);
MemberInfoModel
getByUserId
(
Long
userId
);
List
<
MemberInfoModel
>
finfindEnterpriseAdmin
(
Long
enterpriseId
);
}
src/main/resources/application-prod.yml
View file @
499d532a
...
...
@@ -3,3 +3,4 @@ sms:
type
:
tjxak
api
:
v3
:
http://sms.tjxak.com/smsGateWay/sms?t=%s&c=%s
src/main/resources/mappers/management/OrganizationPOMapper.xml
View file @
499d532a
...
...
@@ -11,30 +11,12 @@
</if>
</select>
<select
id=
"queryEnterprisePageList"
resultType=
"com.qkdata.biz.management.vo.EnterpriseListItemModel"
>
SELECT o.id,
o.`name`,
s.username admin_mobile,
s.nick_name admin_nick_name,
e.`name` admin_name,
o.create_time,
e.avatar_url admin_avatar_url,
s.`status` admin_status,
s.last_login_time,
o.logo_url,
o.province,
o.city,
o.address
SELECT o.*
FROM organization o
INNER JOIN user_ext e on o.id = e.enterprise_id
INNER JOIN sys_user s on e.user_id = s.id
INNER JOIN sys_user_role ur on ur.user_id = s.id
WHERE o.is_del = 0 and o.type='ENTERPRISE' and ur.role_id=3
where is_del =0 and o.type = 'ENTERPRISE'
<if
test=
"p.enterpriseName != null and p.enterpriseName != ''"
>
and o.`name` like concat('%',#{p.enterpriseName},'%')
</if>
<if
test=
"p.adminMobile != null and p.adminMobile != ''"
>
and s.username like concat('%',#{p.adminMobile},'%')
</if>
order by o.create_time desc
</select>
</mapper>
src/main/resources/mappers/sys/SysUserExtMapper.xml
View file @
499d532a
...
...
@@ -81,4 +81,27 @@
WHERE u.is_del = 0
and u.id = #{userId}
</select>
<select
id=
"finfindEnterpriseAdmin"
resultType=
"com.qkdata.biz.management.vo.MemberInfoModel"
>
SELECT u.id,
u.username,
u.nick_name,
u.last_login_time,
u.activate_time,
u.create_time,
u.`status`,
e.`name`,
e.sex,
e.age,
e.avatar_url,
e.type,
e.enterprise_id,
e.vip_start_time,
e.vip_end_time
FROM sys_user u
INNER JOIN user_ext e on u.id = e.user_id
INNER JOIN sys_user_role ur on ur.user_id = u.id
WHERE u.is_del = 0 and ur.role_id=3
and e.enterprise_id = #{enterpriseId}
order by u.create_time asc
</select>
</mapper>
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