Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
liqin
chnmuseum-party
Commits
d4472b09
Commit
d4472b09
authored
Jul 08, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
限制有机顶盒用户的机构修改名称
parent
01418334
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
LoginController.java
...va/cn/chnmuseum/party/web/controller/LoginController.java
+4
-4
TOrganController.java
...a/cn/chnmuseum/party/web/controller/TOrganController.java
+10
-3
No files found.
src/main/java/cn/chnmuseum/party/web/controller/LoginController.java
View file @
d4472b09
...
...
@@ -334,11 +334,11 @@ public class LoginController extends BaseController {
HttpServletRequest
request
)
{
String
regUrl
;
if
(
"H5"
.
equalsIgnoreCase
(
clientType
))
{
//
regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/h5/login";
regUrl
=
request
.
getScheme
()
+
"://"
+
request
.
getServerName
()
+
"/h5/login"
;
regUrl
=
request
.
getScheme
()
+
"://"
+
request
.
getServerName
()
+
":8088/h5/login"
;
//
regUrl = request.getScheme() + "://" + request.getServerName() + "/h5/login";
}
else
{
//
regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/plat/#/login";
regUrl
=
request
.
getScheme
()
+
"://"
+
request
.
getServerName
()
+
"/wdzcfwpt/"
;
regUrl
=
request
.
getScheme
()
+
"://"
+
request
.
getServerName
()
+
":8088/plat/#/login"
;
//
regUrl = request.getScheme() + "://" + request.getServerName() + "/wdzcfwpt/";
}
QrConfig
config
=
new
QrConfig
(
width
,
height
);
config
.
setCharset
(
StandardCharsets
.
UTF_8
);
...
...
src/main/java/cn/chnmuseum/party/web/controller/TOrganController.java
View file @
d4472b09
...
...
@@ -144,13 +144,20 @@ public class TOrganController extends BaseController {
return
resultMap
;
}
}
// 机构存在机顶盒用户,不让修改地理位置
// 机构存在机顶盒用户,不让修改地理位置
和名称
TOrgan
oldOrgan
=
tOrganService
.
getById
(
tOrgan
.
getId
());
List
<
TUser
>
list
=
userService
.
list
(
new
UpdateWrapper
<
TUser
>().
eq
(
"org_id"
,
tOrgan
.
getId
()).
eq
(
"is_deleted"
,
"0"
));
if
(!
oldOrgan
.
getAreaId
().
equals
(
tOrgan
.
getAreaId
())
&&
CollectionUtil
.
isNotEmpty
(
list
))
{
return
getFailResult
(
"机构存在机顶盒账号,不能修改地理位置!"
);
if
(
CollectionUtil
.
isNotEmpty
(
list
)
)
{
if
(!
oldOrgan
.
getAreaId
().
equals
(
tOrgan
.
getAreaId
()))
{
return
getFailResult
(
"机构存在机顶盒账号,不能修改地理位置!"
);
}
if
(!
oldOrgan
.
getName
().
equals
(
tOrgan
.
getName
()))
{
return
getFailResult
(
"机构存在机顶盒账号,不能修改名称!"
);
}
}
tOrgan
.
setUpdateTime
(
DateUtil80
.
getDateTimeOfTimestamp
(
System
.
currentTimeMillis
()));
boolean
flag
;
flag
=
tOrganService
.
updateById
(
tOrgan
);
...
...
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