Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
peizhen-java
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PeiZhen-Java
peizhen-java
Commits
9144c2a3
Commit
9144c2a3
authored
Oct 12, 2023
by
邹磊浩
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
ea306fa4
c8a3c17f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java
+1
-1
No files found.
pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java
View file @
9144c2a3
...
@@ -551,7 +551,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
...
@@ -551,7 +551,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
}
else
if
(
dataViewBo
.
getCondition
()
==
1
){
}
else
if
(
dataViewBo
.
getCondition
()
==
1
){
dataViewVo
.
setDataSum
(
falseData
.
get
(
0
).
getAdminToday
().
intValue
());
dataViewVo
.
setDataSum
(
falseData
.
get
(
0
).
getAdminToday
().
intValue
());
}
else
{
}
else
{
dataViewVo
.
setDataSum
(
falseData
.
get
(
0
).
getAdminS
even
().
intValue
());
dataViewVo
.
setDataSum
(
falseData
.
get
(
0
).
getAdminS
um
().
intValue
());
}
}
//return baseMapper.selectDataView(dataViewBo);
//return baseMapper.selectDataView(dataViewBo);
return
dataViewVo
;
return
dataViewVo
;
...
...
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