Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
aserver
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
15所TongWeb
aserver
Commits
56f4240b
Commit
56f4240b
authored
Apr 08, 2021
by
胡文斌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
使用公共包方法
parent
6944a59e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
10 deletions
+13
-10
UserService.java
src/main/java/com/archser/aserver/service/UserService.java
+13
-10
No files found.
src/main/java/com/archser/aserver/service/UserService.java
View file @
56f4240b
package
com
.
archser
.
aserver
.
service
;
import
com.archser.aserver.model.Organ
;
import
com.archser.aserver.util.redis.InfoUser
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Optional
;
...
...
@@ -10,6 +9,10 @@ import com.archser.aserver.model.Fond;
import
com.archser.aserver.model.Menu
;
import
com.archser.aserver.model.User
;
import
com.archser.commons.db.InfoUser
;
import
com.archser.commons.model.AsOrgan
;
import
com.archser.commons.model.AsSystem
;
import
com.archser.commons.model.AsUser
;
import
com.jfinal.aop.Before
;
import
com.jfinal.kit.Kv
;
import
com.jfinal.plugin.activerecord.Db
;
...
...
@@ -30,7 +33,7 @@ public class UserService {
int
update
=
Db
.
update
(
Db
.
getSql
(
"updatePassword"
),
password
,
username
);
if
(
update
>
0
)
{
//更新redis信息
User
user
=
InfoUser
.
getUser
(
username
);
As
User
user
=
InfoUser
.
getUser
(
username
);
user
.
setPassword
(
password
);
InfoUser
.
saveUser
(
user
);
}
...
...
@@ -160,12 +163,12 @@ public class UserService {
* @param userId
* @return
*/
public
List
<
System
>
findSystemWithUserPermission
(
int
userId
)
{
public
List
<
As
System
>
findSystemWithUserPermission
(
int
userId
)
{
/**
* xiaoying 20200414 YZJ-2725 隐藏菜单无法登录问题 start
*/
List
<
System
>
sysList
=
System
.
dao
.
find
(
Db
.
getSqlPara
(
"findSystemWithUserPermission"
,
Kv
.
by
(
"userId"
,
userId
)));
List
<
As
System
>
sysList
=
As
System
.
dao
.
find
(
Db
.
getSqlPara
(
"findSystemWithUserPermission"
,
Kv
.
by
(
"userId"
,
userId
)));
// xiaoying 20200608 勾选为隐藏菜单时找下一个服务
for
(
int
i
=
sysList
.
size
()
-
1
;
i
>=
0
;
i
--)
{
Integer
count
=
0
;
...
...
@@ -186,7 +189,7 @@ public class UserService {
*/
}
public
Optional
<
System
>
getSystemByName
(
String
systemName
,
List
<
System
>
systemList
)
{
public
Optional
<
AsSystem
>
getSystemByName
(
String
systemName
,
List
<
As
System
>
systemList
)
{
return
systemList
.
stream
().
filter
(
sys
->
systemName
.
equalsIgnoreCase
(
sys
.
get
(
"name"
)))
.
findFirst
();
}
...
...
@@ -283,13 +286,13 @@ public class UserService {
* @date 2021/1/8 17:05
* @return com.archser.aserver.model.Organ
*/
public
Organ
getUserFondOrgan
(
User
user
)
{
public
AsOrgan
getUserFondOrgan
(
As
User
user
)
{
Integer
organId
=
user
.
getOrganId
();
Organ
organ
=
Organ
.
dao
.
findById
(
organId
);
AsOrgan
organ
=
As
Organ
.
dao
.
findById
(
organId
);
if
(!
"Y"
.
equalsIgnoreCase
(
organ
.
getIsunit
()))
{
String
[]
split
=
organ
.
getIdseq
().
split
(
"\\."
);
String
fondOrganId
=
split
[
split
.
length
-
1
];
organ
=
Organ
.
dao
.
findById
(
fondOrganId
);
organ
=
As
Organ
.
dao
.
findById
(
fondOrganId
);
}
return
organ
;
}
...
...
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