Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
cf559217
Commit
cf559217
authored
Dec 22, 2023
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员realName不对、企业信息不展示bug修改
parent
eb824ed2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
TzBaseEnterpriseInfoController.java
...le/tcm/biz/controller/TzBaseEnterpriseInfoController.java
+1
-1
TzsUserInfoServiceImpl.java
...t/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
+3
-2
RegUnitInfoController.java
.../module/tcm/flc/biz/controller/RegUnitInfoController.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java
View file @
cf559217
...
@@ -183,7 +183,7 @@ public class TzBaseEnterpriseInfoController {
...
@@ -183,7 +183,7 @@ public class TzBaseEnterpriseInfoController {
}
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/info"
)
@GetMapping
(
value
=
"/info"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询企业端当前登录人所在企业详情"
,
notes
=
"查询企业端当前登录人所在企业详情"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询企业端当前登录人所在企业详情"
,
notes
=
"查询企业端当前登录人所在企业详情"
)
public
ResponseModel
<
IPage
<
TzBaseEnterpriseInfoDto
>>
pageInfo
(
PageParam
pageParam
)
{
public
ResponseModel
<
IPage
<
TzBaseEnterpriseInfoDto
>>
pageInfo
(
PageParam
pageParam
)
{
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
View file @
cf559217
...
@@ -231,12 +231,13 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -231,12 +231,13 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
String
roles
=
map
.
get
(
"role"
).
toString
();
String
roles
=
map
.
get
(
"role"
).
toString
();
String
status
=
map
.
get
(
"status"
).
toString
();
String
status
=
map
.
get
(
"status"
).
toString
();
String
roleGroupCode
=
map
.
get
(
"roleGroup"
).
toString
();
String
roleGroupCode
=
map
.
get
(
"roleGroup"
).
toString
();
TzsUserInfo
tzsUserInfo
=
tzsUserInfoMapper
.
selectById
(
sequenceNbr
);
FeignClientResult
<
AgencyUserModel
>
userResult
=
null
;
FeignClientResult
<
AgencyUserModel
>
userResult
=
null
;
try
{
try
{
AgencyUserModel
agencyUserModel
=
new
AgencyUserModel
();
AgencyUserModel
agencyUserModel
=
new
AgencyUserModel
();
agencyUserModel
.
setUserName
(
loginName
);
agencyUserModel
.
setUserName
(
loginName
);
agencyUserModel
.
setRealName
(
loginName
);
agencyUserModel
.
setRealName
(
tzsUserInfo
.
getName
()
);
agencyUserModel
.
setLockStatus
(
status
);
agencyUserModel
.
setLockStatus
(
status
);
agencyUserModel
.
setPassword
(
pwd
);
agencyUserModel
.
setPassword
(
pwd
);
agencyUserModel
.
setRePassword
(
pwd
);
agencyUserModel
.
setRePassword
(
pwd
);
...
@@ -265,7 +266,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -265,7 +266,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
});
});
//添加人员管理角色
//添加人员管理角色
TzsUserInfo
tzsUserInfo
=
tzsUserInfoMapper
.
selectById
(
sequenceNbr
);
String
post
=
tzsUserInfo
.
getPost
();
String
post
=
tzsUserInfo
.
getPost
();
if
(
post
.
contains
(
PersonManageRoleEnum
.
code
.
getId
().
toString
())){
if
(
post
.
contains
(
PersonManageRoleEnum
.
code
.
getId
().
toString
())){
String
companyType
=
tzsUserInfoMapper
.
selectCompanyTypeById
(
companySeq
);
String
companyType
=
tzsUserInfoMapper
.
selectCompanyTypeById
(
companySeq
);
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/RegUnitInfoController.java
View file @
cf559217
...
@@ -96,7 +96,7 @@ public class RegUnitInfoController extends BaseController {
...
@@ -96,7 +96,7 @@ public class RegUnitInfoController extends BaseController {
return
ResponseHelper
.
buildResponse
(
iRegUnitInfoService
.
submit
(
pageId
,
taskId
,
planInstanceId
,
topic
,
tableName
,
kv
));
return
ResponseHelper
.
buildResponse
(
iRegUnitInfoService
.
submit
(
pageId
,
taskId
,
planInstanceId
,
topic
,
tableName
,
kv
));
}
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"/adminInfo"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/adminInfo"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询企业管理员信息"
,
notes
=
"查询企业管理员信息"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询企业管理员信息"
,
notes
=
"查询企业管理员信息"
)
public
ResponseModel
<
RegUnitInfoDto
>
adminInfo
()
{
public
ResponseModel
<
RegUnitInfoDto
>
adminInfo
()
{
...
...
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