Commit d4472b09 authored by nie'hong's avatar nie'hong

限制有机顶盒用户的机构修改名称

parent 01418334
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment