Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
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
吴学德
gdtel-gztel-school-center
Commits
3af8152e
Commit
3af8152e
authored
Jul 07, 2021
by
陈浩建
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复新用户审核模块bug
parent
d00ee999
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java
+1
-0
service-manager/src/main/java/com/winsun/controller/NewUserController.java
+1
-1
service-manager/src/main/java/com/winsun/controller/PackageUpgradeController.java
+0
-2
service-manager/src/main/java/com/winsun/controller/PartnerController.java
+5
-0
No files found.
core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java
View file @
3af8152e
...
...
@@ -750,6 +750,7 @@ public class LoginPwdController extends BaseController {
hhrUser
.
setStudentImgUrl
(
PicturesUtil
.
uploadPictures
(
stuCard
,
sysUser
.
getId
(),
PATHTYPE
));
hhrUser
.
setGrade
(
classZ
);
hhrUser
.
setUploadState
(
1
);
hhrUser
.
setFxs
(
""
);
insert
+=
hhrUserMapper
.
insert
(
hhrUser
);
if
(
insert
==
3
)
{
return
ResponseData
.
success
(
"账号创建成功,待管理员审核!"
);
...
...
service-manager/src/main/java/com/winsun/controller/NewUserController.java
View file @
3af8152e
...
...
@@ -210,7 +210,7 @@ public class NewUserController extends BaseController {
}
for
(
SysUser
sysUser
:
sysUserList
)
{
if
(
sysUser
.
getId
().
equals
(
id
)){
objectMap
.
put
(
"name"
,
sysUser
.
get
Phon
e
());
objectMap
.
put
(
"name"
,
sysUser
.
get
Nam
e
());
objectMap
.
put
(
"phone"
,
sysUser
.
getPhone
());
objectMap
.
put
(
"sex"
,
sysUser
.
getSex
());
objectMap
.
put
(
"status"
,
sysUser
.
getStatus
());
...
...
service-manager/src/main/java/com/winsun/controller/PackageUpgradeController.java
View file @
3af8152e
...
...
@@ -8,10 +8,8 @@ import com.winsun.auth.core.base.controller.BaseController;
import
com.winsun.auth.core.common.model.ResponseData
;
import
com.winsun.bean.Package
;
import
com.winsun.bean.PackageUpgrade
;
import
com.winsun.bean.Teacher
;
import
com.winsun.mapper.PackageMapper
;
import
com.winsun.mapper.PackageUpgradeMapper
;
import
com.winsun.mapper.TeacherMapper
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
service-manager/src/main/java/com/winsun/controller/PartnerController.java
View file @
3af8152e
...
...
@@ -195,9 +195,14 @@ public class PartnerController extends BaseController {
dataMap
.
put
(
"isActive"
,
hhrUser
.
getIsActive
());
dataMap
.
put
(
"idCardImgUrl"
,
hhrUser
.
getIdcardImgUrl
());
dataMap
.
put
(
"studentImgUrl"
,
hhrUser
.
getStudentImgUrl
());
if
(
StringUtils
.
isNotBlank
(
hhrUser
.
getFxs
())){
dataMap
.
put
(
"fxs"
,
hhrUser
.
getFxs
());
fxsCount
=
hhrUser
.
getFxs
().
length
()
==
0
?
0
:
hhrUser
.
getFxs
().
split
(
","
).
length
;
dataMap
.
put
(
"fxsCount"
,
fxsCount
);
}
else
{
dataMap
.
put
(
"fxs"
,
""
);
dataMap
.
put
(
"fxsCount"
,
fxsCount
);
}
dataMap
.
put
(
"hasHhr"
,
"0"
);
break
;
}
...
...
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