Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
b7750433
Commit
b7750433
authored
Mar 03, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
前端客服手机号码更新-fxj
parent
63947b73
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
6 deletions
+20
-6
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+0
-1
SysUserDeptPermission.java
....plus.v1/yifu/admin/api/entity/SysUserDeptPermission.java
+4
-0
UserCspVO.java
...a/com/yifu.cloud.plus.v1/yifu/admin/api/vo/UserCspVO.java
+4
-0
UserDeptPermissionController.java
...1/yifu/admin/controller/UserDeptPermissionController.java
+7
-4
SysUserDeptPermissionServiceImpl.java
.../admin/service/impl/SysUserDeptPermissionServiceImpl.java
+2
-0
SysUserDeptPermissionMapper.xml
...src/main/resources/mapper/SysUserDeptPermissionMapper.xml
+3
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
b7750433
...
...
@@ -462,7 +462,6 @@ public class TSettleDomainController {
}
catch
(
UnsupportedEncodingException
e
)
{
e
.
printStackTrace
();
}
log
.
error
(
"jsonStr:"
+
jsonStr
);
List
<
TDomainUpCsVo
>
list
=
JSONObject
.
parseArray
(
jsonStr
,
TDomainUpCsVo
.
class
);
return
tSettleDomainService
.
updateProjectCsInfo
(
list
);
}
...
...
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysUserDeptPermission.java
View file @
b7750433
...
...
@@ -57,6 +57,10 @@ public class SysUserDeptPermission extends Model<SysUserDeptPermission> {
@Schema
(
description
=
"关联项目名称"
)
private
String
projectName
;
@NotBlank
(
message
=
"关联项目ID 不能为空"
)
@Schema
(
description
=
"关联项目ID"
)
private
String
projectId
;
@Schema
(
description
=
"归属系统 yifu-mvp、yifu-csp"
)
private
String
client
;
...
...
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/UserCspVO.java
View file @
b7750433
...
...
@@ -79,6 +79,10 @@ public class UserCspVO implements Serializable {
@Schema
(
description
=
"关联项目名称"
)
private
String
projectName
;
@NotBlank
(
message
=
"关联项目ID 不能为空"
)
@Schema
(
description
=
"关联项目ID"
)
private
String
projectId
;
@Schema
(
description
=
"归属系统 0 yifu-mvp 1 yifu-csp"
)
private
String
client
;
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserDeptPermissionController.java
View file @
b7750433
...
...
@@ -100,16 +100,19 @@ public class UserDeptPermissionController {
@PostMapping
(
"/relation"
)
public
R
<
String
>
relationUser
(
@RequestBody
SysUserDeptPermission
sysUserDeptPermission
)
{
if
(
Common
.
isEmpty
(
sysUserDeptPermission
.
getProjectNo
())){
R
.
failed
(
"项目编码不能为空"
);
return
R
.
failed
(
"项目编码不能为空"
);
}
if
(
Common
.
isEmpty
(
sysUserDeptPermission
.
getProjectName
())){
R
.
failed
(
"项目名称不能为空"
);
return
R
.
failed
(
"项目名称不能为空"
);
}
if
(
Common
.
isEmpty
(
sysUserDeptPermission
.
getUserId
())){
R
.
failed
(
"用户ID不能为空"
);
return
R
.
failed
(
"用户ID不能为空"
);
}
if
(
Common
.
isEmpty
(
sysUserDeptPermission
.
getDeptId
())){
R
.
failed
(
"部门ID不能为空"
);
return
R
.
failed
(
"部门ID不能为空"
);
}
if
(
Common
.
isEmpty
(
sysUserDeptPermission
.
getProjectId
())){
return
R
.
failed
(
"项目ID不能为空"
);
}
return
sysUserDeptPermissionService
.
relationUser
(
sysUserDeptPermission
);
}
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserDeptPermissionServiceImpl.java
View file @
b7750433
...
...
@@ -338,6 +338,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
authority
.
setProjectNo
(
projectNoStr
);
authority
.
setProjectName
(
tPermissionInfo
.
getProjectName
());
authority
.
setUserType
(
tPermissionInfo
.
getUserType
());
authority
.
setProjectId
(
tPermissionInfo
.
getProjectId
());
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tPermissionInfo
.
getPermissionsType
()))
{
// 全部数据
authority
.
setHaveAll
(
true
);
...
...
@@ -453,6 +454,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
permission
.
setProjectName
(
entity
.
getProjectName
());
permission
.
setProjectNo
(
entity
.
getProjectNo
());
permission
.
setUserType
(
entity
.
getUserType
());
permission
.
setProjectId
(
entity
.
getProjectId
());
baseMapper
.
insert
(
permission
);
if
(
Common
.
isNotNull
(
permission
)
&&
Common
.
isNotNull
(
permission
.
getUserId
())){
return
R
.
ok
(
Boolean
.
TRUE
,
CommonConstants
.
SAVE_SUCCESS
);
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserDeptPermissionMapper.xml
View file @
b7750433
...
...
@@ -29,6 +29,7 @@
<result
column=
"user_type"
property=
"userType"
/>
<result
column=
"permissions_type"
property=
"permissionsType"
/>
<result
column=
"appoint_dept_scope"
property=
"appointDeptScope"
/>
<result
column=
"project_id"
property=
"projectId"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -40,7 +41,8 @@
a.client,
a.user_type,
a.permissions_type,
a.appoint_dept_scope
a.appoint_dept_scope,
a.project_id
</sql>
<select
id=
"getUserDeptPermission"
resultMap=
"BaseResultMap"
>
...
...
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