Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
479a7384
Commit
479a7384
authored
Dec 18, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
员工数据补录
parent
299603ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
AppUserRelationBiz.java
...github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
+5
-0
AppUserRelationMapper.java
.../wxiaoqi/security/admin/mapper/AppUserRelationMapper.java
+1
-0
AppUserRelationMapper.xml
...admin/src/main/resources/mapper/AppUserRelationMapper.xml
+8
-4
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
View file @
479a7384
...
...
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
import
org.springframework.stereotype.Service
;
import
tk.mybatis.mapper.entity.Example
;
import
java.time.Instant
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -411,5 +412,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
List
<
UserBo
>
userBoList
=
mapper
.
findAllRelations
();
return
CollectionUtils
.
isEmpty
(
userBoList
)?
Collections
.
emptyList
():
userBoList
;
}
public
void
updateParentIdByUserId
(
Integer
leaderId
,
Integer
userId
)
{
mapper
.
updateParentIdByUserId
(
leaderId
,
userId
,
Instant
.
now
().
toEpochMilli
());
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserRelationMapper.java
View file @
479a7384
...
...
@@ -28,4 +28,5 @@ public interface AppUserRelationMapper extends Mapper<AppUserRelation> {
List
<
UserBo
>
findAllRelations
();
void
updateParentIdByUserId
(
@Param
(
"leaderId"
)
Integer
leaderId
,
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"updTime"
)
Long
updTime
);
}
ace-modules/ace-admin/src/main/resources/mapper/AppUserRelationMapper.xml
View file @
479a7384
...
...
@@ -27,14 +27,18 @@
</select>
<select
id=
"findAllRelations"
resultType=
"com.github.wxiaoqi.security.admin.bo.UserBo"
>
select au
lp.
id as `leaderId`,aulp.username as `leaderPhone`,aulc.id as `userId`,aulc.username as `phone`,
select au
r.parent_
id as `leaderId`,aulp.username as `leaderPhone`,aulc.id as `userId`,aulc.username as `phone`,
IFNULL(audp.realname,audp.nickname) as `leaderName`,IFNULL(audc.realname,audc.nickname) as `name`,aupt.company_name as `companyName`
from `app_user_relation` as aur
inner
join `app_user_login` as aulp on aulp.id = aur.parent_id
left
join `app_user_login` as aulp on aulp.id = aur.parent_id
inner join `app_user_login` as aulc on aulc.id=aur.user_id
inner
join `app_user_detail` as audp on audp.userid= aulp.id
left
join `app_user_detail` as audp on audp.userid= aulp.id
inner join `app_user_detail` as `audc` on audc.userid= aulc.id
left join `app_user_position_temp` as `aupt` on aupt.user_id = aulc.id
where aur.is_del=0 and aulp.isdel=0 and aulc.isdel=0
where aur.is_del=0 and aulc.isdel=0
</select>
<select
id=
"updateParentIdByUserId"
>
update `app_user_relation` set `parent_id`=#{leaderId},`upd_time`=#{updTime} where user_id=#{userId}
</select>
</mapper>
\ No newline at end of file
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