Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
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
Administrator
dsk-cr20g
Commits
65fe944f
Commit
65fe944f
authored
Sep 07, 2023
by
施翔轲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改企业管理相关提示语
parent
dbb34061
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
SysTenantController.java
...va/com/dsk/web/controller/system/SysTenantController.java
+4
-4
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantController.java
View file @
65fe944f
...
@@ -84,7 +84,7 @@ public class SysTenantController extends BaseController {
...
@@ -84,7 +84,7 @@ public class SysTenantController extends BaseController {
@PostMapping
()
@PostMapping
()
public
R
<
Void
>
add
(
@Validated
(
AddGroup
.
class
)
@RequestBody
SysTenantBo
bo
)
{
public
R
<
Void
>
add
(
@Validated
(
AddGroup
.
class
)
@RequestBody
SysTenantBo
bo
)
{
if
(!
tenantService
.
checkCompanyNameUnique
(
bo
))
{
if
(!
tenantService
.
checkCompanyNameUnique
(
bo
))
{
return
R
.
fail
(
"新增
租户
'"
+
bo
.
getCompanyName
()
+
"'失败,企业名称已存在"
);
return
R
.
fail
(
"新增
企业
'"
+
bo
.
getCompanyName
()
+
"'失败,企业名称已存在"
);
}
}
return
toAjax
(
TenantHelper
.
ignore
(()
->
tenantService
.
insertByBo
(
bo
)));
return
toAjax
(
TenantHelper
.
ignore
(()
->
tenantService
.
insertByBo
(
bo
)));
}
}
...
@@ -100,7 +100,7 @@ public class SysTenantController extends BaseController {
...
@@ -100,7 +100,7 @@ public class SysTenantController extends BaseController {
public
R
<
Void
>
edit
(
@Validated
(
EditGroup
.
class
)
@RequestBody
SysTenantBo
bo
)
{
public
R
<
Void
>
edit
(
@Validated
(
EditGroup
.
class
)
@RequestBody
SysTenantBo
bo
)
{
tenantService
.
checkTenantAllowed
(
bo
.
getTenantId
());
tenantService
.
checkTenantAllowed
(
bo
.
getTenantId
());
if
(!
tenantService
.
checkCompanyNameUnique
(
bo
))
{
if
(!
tenantService
.
checkCompanyNameUnique
(
bo
))
{
return
R
.
fail
(
"修改
租户
'"
+
bo
.
getCompanyName
()
+
"'失败,公司名称已存在"
);
return
R
.
fail
(
"修改
企业
'"
+
bo
.
getCompanyName
()
+
"'失败,公司名称已存在"
);
}
}
return
toAjax
(
tenantService
.
updateByBo
(
bo
));
return
toAjax
(
tenantService
.
updateByBo
(
bo
));
}
}
...
@@ -162,8 +162,8 @@ public class SysTenantController extends BaseController {
...
@@ -162,8 +162,8 @@ public class SysTenantController extends BaseController {
@SaCheckPermission
(
"system:tenant:edit"
)
@SaCheckPermission
(
"system:tenant:edit"
)
@Log
(
title
=
"租户"
,
businessType
=
BusinessType
.
UPDATE
)
@Log
(
title
=
"租户"
,
businessType
=
BusinessType
.
UPDATE
)
@GetMapping
(
"/syncTenantPackage"
)
@GetMapping
(
"/syncTenantPackage"
)
public
R
<
Void
>
syncTenantPackage
(
@NotBlank
(
message
=
"
租户
ID不能为空"
)
String
tenantId
,
public
R
<
Void
>
syncTenantPackage
(
@NotBlank
(
message
=
"
企业
ID不能为空"
)
String
tenantId
,
@NotNull
(
message
=
"
套餐
ID不能为空"
)
Long
packageId
)
{
@NotNull
(
message
=
"
企业方案
ID不能为空"
)
Long
packageId
)
{
return
toAjax
(
TenantHelper
.
ignore
(()
->
tenantService
.
syncTenantPackage
(
tenantId
,
packageId
)));
return
toAjax
(
TenantHelper
.
ignore
(()
->
tenantService
.
syncTenantPackage
(
tenantId
,
packageId
)));
}
}
...
...
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