manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加分离端接口需要的数据

Browse Source
This commit is contained in:
卓源软件
2022-05-14 01:38:26 +00:00
committed by Gitee
parent 627cd062c6
commit cb8a4d2f73
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
View File

@@ -33,6 +33,7 @@ import com.jeesite.common.web.CookieUtils;
import com.jeesite.common.web.http.ServletUtils; import com.jeesite.common.web.http.ServletUtils;
import com.jeesite.modules.sys.entity.Menu; import com.jeesite.modules.sys.entity.Menu;
import com.jeesite.modules.sys.entity.User; import com.jeesite.modules.sys.entity.User;
import com.jeesite.modules.sys.utils.CorpUtils;
import com.jeesite.modules.sys.utils.PwdUtils; import com.jeesite.modules.sys.utils.PwdUtils;
import com.jeesite.modules.sys.utils.UserUtils; import com.jeesite.modules.sys.utils.UserUtils;
@@ -189,11 +190,16 @@ public class LoginController extends BaseController{
ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString); ServletUtils.redirectUrl(request, response, adminPath + "/login" + queryString);
return null; return null;
} }
// 获取当前会话对象，并返回一些数据
Session session = UserUtils.getSession();
model.addAttribute("user", user); // 设置当前用户信息
model.addAttribute("user", user); // 设置当前用户信息 model.addAttribute("user", user); // 设置当前用户信息
model.addAttribute("demoMode", Global.isDemoMode()); model.addAttribute("demoMode", Global.isDemoMode());
model.addAttribute("useCorpModel", Global.isUseCorpModel());
//获取当前会话对象 model.addAttribute("currentCorpCode", CorpUtils.getCurrentCorpCode());
Session session = UserUtils.getSession(); model.addAttribute("currentCorpName", CorpUtils.getCurrentCorpName());
model.addAttribute("sysCode", session.getAttribute("sysCode"));
// 是否是登录操作 // 是否是登录操作
boolean isLogin = Global.TRUE.equals(session.getAttribute(BaseAuthorizingRealm.IS_LOGIN_OPER)); boolean isLogin = Global.TRUE.equals(session.getAttribute(BaseAuthorizingRealm.IS_LOGIN_OPER));

9
modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
View File

@@ -63,6 +63,8 @@ public class CorpAdminController extends BaseController {
user.setCorpCode(null); user.setCorpCode(null);
user.setCorpName(null); user.setCorpName(null);
model.addAttribute("user", user); model.addAttribute("user", user);
model.addAttribute("currentCorpCode", user.getCurrentUser().getCorpCode_());
model.addAttribute("currentCorpName", user.getCurrentUser().getCorpName_());
model.addAttribute("useCorpModel", Global.getConfigToBoolean("user.useCorpModel", "false")); model.addAttribute("useCorpModel", Global.getConfigToBoolean("user.useCorpModel", "false"));
return "modules/sys/user/corpAdminList"; return "modules/sys/user/corpAdminList";
} }
@@ -108,7 +110,7 @@ public class CorpAdminController extends BaseController {
@RequiresPermissions("sys:corpAdmin:edit") @RequiresPermissions("sys:corpAdmin:edit")
@PostMapping(value = "save") @PostMapping(value = "save")
@ResponseBody @ResponseBody
public String save(@Validated User user, String oldLoginCode, String op) { public String save(@Validated User user, String op, HttpServletRequest request) {
if (!user.getCurrentUser().isSuperAdmin()){ if (!user.getCurrentUser().isSuperAdmin()){
return renderResult(Global.FALSE, text("越权操作，只有超级管理员才能修改此数据！")); return renderResult(Global.FALSE, text("越权操作，只有超级管理员才能修改此数据！"));
} }
@@ -121,8 +123,9 @@ public class CorpAdminController extends BaseController {
if (StringUtils.isBlank(user.getCorpCode_())){ if (StringUtils.isBlank(user.getCorpCode_())){
return renderResult(Global.FALSE, text("租户代码不能为空！")); return renderResult(Global.FALSE, text("租户代码不能为空！"));
} }
if (!Global.TRUE.equals(userService.checkLoginCode(oldLoginCode, user.getLoginCode()))) { User old = super.getWebDataBinderSource(request);
return renderResult(Global.FALSE, text("保存管理员''{0}''失败，登录账号已存在", user.getLoginCode())); if (!Global.TRUE.equals(userService.checkLoginCode(old != null ? old.getLoginCode() : "", user.getLoginCode()))) {
return renderResult(Global.FALSE, text("保存管理员失败，登录账号''{0}''已存在", user.getLoginCode()));
} }
if (user.getIsNewRecord()){ if (user.getIsNewRecord()){
user.setUserType(User.USER_TYPE_NONE); // 仅登录用户 user.setUserType(User.USER_TYPE_NONE); // 仅登录用户