Skip to content

G
guns-vip
Commit 765f30da by fengshuonan
Options

调整用户管理字段修改

parent be482817
Showing with 51 additions and 29 deletions
src/main/java/cn/stylefeng/guns/core/metadata/GunsMpFieldHandler.java 0 → 100644
package cn.stylefeng.guns.core.metadata;
import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.roses.core.metadata.CustomMetaObjectHandler;
import org.springframework.stereotype.Component;
/**
* 字段填充器
*
* @author fengshuonan
* @Date 2018/12/8 15:01
*/
@Component
public class GunsMpFieldHandler extends CustomMetaObjectHandler {
@Override
protected Object getUserUniqueId() {
return ShiroKit.getUser().getId();
}
}
src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java
...@@ -252,15 +252,15 @@ public class UserMgrController extends BaseController { ...@@ -252,15 +252,15 @@ public class UserMgrController extends BaseController {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
User oldUser = userService.selectById(user.getId()); User oldUser = userService.selectById(user.getUserId());
if (ShiroKit.hasRole(Const.ADMIN_NAME)) { if (ShiroKit.hasRole(Const.ADMIN_NAME)) {
this.userService.updateById(UserFactory.editUser(user, oldUser)); this.userService.updateById(UserFactory.editUser(user, oldUser));
return SUCCESS_TIP; return SUCCESS_TIP;
} else { } else {
assertAuth(user.getId()); assertAuth(user.getUserId());
ShiroUser shiroUser = ShiroKit.getUser(); ShiroUser shiroUser = ShiroKit.getUser();
if (shiroUser.getId().equals(user.getId())) { if (shiroUser.getId().equals(user.getUserId())) {
this.userService.updateById(UserFactory.editUser(user, oldUser)); this.userService.updateById(UserFactory.editUser(user, oldUser));
return SUCCESS_TIP; return SUCCESS_TIP;
} else { } else {
......
src/main/java/cn/stylefeng/guns/modular/system/factory/UserFactory.java
...@@ -68,8 +68,8 @@ public class UserFactory { ...@@ -68,8 +68,8 @@ public class UserFactory {
if (ToolUtil.isNotEmpty(newUser.getBirthday())) { if (ToolUtil.isNotEmpty(newUser.getBirthday())) {
oldUser.setBirthday(newUser.getBirthday()); oldUser.setBirthday(newUser.getBirthday());
} }
if (ToolUtil.isNotEmpty(newUser.getDeptid())) { if (ToolUtil.isNotEmpty(newUser.getDeptId())) {
oldUser.setDeptId(newUser.getDeptid()); oldUser.setDeptId(newUser.getDeptId());
} }
if (ToolUtil.isNotEmpty(newUser.getSex())) { if (ToolUtil.isNotEmpty(newUser.getSex())) {
oldUser.setSex(newUser.getSex()); oldUser.setSex(newUser.getSex());
......
src/main/java/cn/stylefeng/guns/modular/system/transfer/UserDto.java
...@@ -29,7 +29,7 @@ import java.util.Date; ...@@ -29,7 +29,7 @@ import java.util.Date;
@Data @Data
public class UserDto { public class UserDto {
private Long id; private Long userId;
private String account; private String account;
private String password; private String password;
private String name; private String name;
...@@ -39,8 +39,8 @@ public class UserDto { ...@@ -39,8 +39,8 @@ public class UserDto {
private String sex; private String sex;
private String email; private String email;
private String phone; private String phone;
private String roleid; private String roleId;
private Long deptid; private Long deptId;
private String status; private String status;
private String avatar; private String avatar;
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/DictWarpper.java
...@@ -52,7 +52,7 @@ public class DictWarpper extends BaseControllerWrapper { ...@@ -52,7 +52,7 @@ public class DictWarpper extends BaseControllerWrapper {
@Override @Override
protected void wrapTheMap(Map<String, Object> map) { protected void wrapTheMap(Map<String, Object> map) {
StringBuffer detail = new StringBuffer(); StringBuffer detail = new StringBuffer();
Long id = Long.valueOf(map.get("id").toString()); Long id = Long.valueOf(map.get("dictId").toString());
List<Dict> dicts = ConstantFactory.me().findInDict(id); List<Dict> dicts = ConstantFactory.me().findInDict(id);
if (dicts != null) { if (dicts != null) {
for (Dict dict : dicts) { for (Dict dict : dicts) {
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWarpper.java
...@@ -53,7 +53,7 @@ public class LogWarpper extends BaseControllerWrapper { ...@@ -53,7 +53,7 @@ public class LogWarpper extends BaseControllerWrapper {
protected void wrapTheMap(Map<String, Object> map) { protected void wrapTheMap(Map<String, Object> map) {
String message = (String) map.get("message"); String message = (String) map.get("message");
Long userid = (Long) map.get("userid"); Long userid = (Long) map.get("userId");
map.put("userName", ConstantFactory.me().getUserNameById(userid)); map.put("userName", ConstantFactory.me().getUserNameById(userid));
//如果信息过长,则只截取前100位字符串 //如果信息过长,则只截取前100位字符串
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWarpper.java
...@@ -51,7 +51,7 @@ public class MenuWarpper extends BaseControllerWrapper { ...@@ -51,7 +51,7 @@ public class MenuWarpper extends BaseControllerWrapper {
@Override @Override
protected void wrapTheMap(Map<String, Object> map) { protected void wrapTheMap(Map<String, Object> map) {
map.put("statusName", ConstantFactory.me().getMenuStatusName((String) map.get("status"))); map.put("statusName", ConstantFactory.me().getMenuStatusName((String) map.get("status")));
map.put("isMenuName", YesOrNotEnum.valueOf((Integer) map.get("ismenu"))); map.put("isMenuName", YesOrNotEnum.valueOf((Integer) map.get("menuFlag")));
} }
} }
src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWarpper.java
...@@ -50,7 +50,7 @@ public class RoleWarpper extends BaseControllerWrapper { ...@@ -50,7 +50,7 @@ public class RoleWarpper extends BaseControllerWrapper {
@Override @Override
protected void wrapTheMap(Map<String, Object> map) { protected void wrapTheMap(Map<String, Object> map) {
map.put("pName", ConstantFactory.me().getSingleRoleName((Long) map.get("pid"))); map.put("pName", ConstantFactory.me().getSingleRoleName((Long) map.get("pid")));
map.put("deptName", ConstantFactory.me().getDeptName((Long) map.get("deptid"))); map.put("deptName", ConstantFactory.me().getDeptName((Long) map.get("deptId")));
} }
} }
src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWarpper.java
...@@ -50,8 +50,8 @@ public class UserWarpper extends BaseControllerWrapper { ...@@ -50,8 +50,8 @@ public class UserWarpper extends BaseControllerWrapper {
@Override @Override
protected void wrapTheMap(Map<String, Object> map) { protected void wrapTheMap(Map<String, Object> map) {
map.put("sexName", ConstantFactory.me().getSexName((String) map.get("sex"))); map.put("sexName", ConstantFactory.me().getSexName((String) map.get("sex")));
map.put("roleName", ConstantFactory.me().getRoleName((String) map.get("roleid"))); map.put("roleName", ConstantFactory.me().getRoleName((String) map.get("roleId")));
map.put("deptName", ConstantFactory.me().getDeptName((Long) map.get("deptid"))); map.put("deptName", ConstantFactory.me().getDeptName((Long) map.get("deptId")));
map.put("statusName", ConstantFactory.me().getStatusName((String) map.get("status"))); map.put("statusName", ConstantFactory.me().getStatusName((String) map.get("status")));
} }
......
src/main/resources/application.yml
...@@ -31,6 +31,8 @@ spring: ...@@ -31,6 +31,8 @@ spring:
mybatis-plus: mybatis-plus:
typeAliasesPackage: cn.stylefeng.guns.modular.system.model typeAliasesPackage: cn.stylefeng.guns.modular.system.model
global-config:
metaObject-handler: cn.stylefeng.guns.core.metadata.GunsMpFieldHandler
log: log:
path: guns-logs path: guns-logs
......
src/main/webapp/WEB-INF/system/user/user_add.html
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
<div class="controls"> <div class="controls">
<select v-model="sex" class="form-control"> <select v-model="sex" class="form-control">
<option value="">请选择</option> <option value="">请选择</option>
<option value="1">男</option> <option value="M">男</option>
<option value="2">女</option> <option value="F">女</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<h5>部门 <span class="text-danger">*</span></h5> <h5>部门 <span class="text-danger">*</span></h5>
<div class="controls"> <div class="controls">
<input v-model="deptName" id="detpName" \@click="showDeptSelectTree" type="text" class="form-control" autocomplete="off"> <input v-model="deptName" id="detpName" \@click="showDeptSelectTree" type="text" class="form-control" autocomplete="off">
<input v-model="deptid" type="hidden" class="form-control"> <input v-model="deptId" type="hidden" class="form-control">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
src/main/webapp/WEB-INF/system/user/user_edit.html
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<div class="controls"> <div class="controls">
<select v-model="sex" class="form-control"> <select v-model="sex" class="form-control">
<option value="">请选择</option> <option value="">请选择</option>
<option value="1">男</option> <option value="M">男</option>
<option value="2">女</option> <option value="F">女</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<h5>部门 <span class="text-danger">*</span></h5> <h5>部门 <span class="text-danger">*</span></h5>
<div class="controls"> <div class="controls">
<input v-model="deptName" id="detpName" \@click="showDeptSelectTree" type="text" class="form-control" autocomplete="off"> <input v-model="deptName" id="detpName" \@click="showDeptSelectTree" type="text" class="form-control" autocomplete="off">
<input v-model="deptid" type="hidden" class="form-control"> <input v-model="deptId" type="hidden" class="form-control">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
src/main/webapp/assets/modular/system/user/user_add.js
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
var UserInfoDlg = { var UserInfoDlg = {
data: { data: {
id: "", userId: "",
account: "", account: "",
sex: "", sex: "",
password: "", password: "",
...@@ -12,7 +12,7 @@ var UserInfoDlg = { ...@@ -12,7 +12,7 @@ var UserInfoDlg = {
email: "", email: "",
name: "", name: "",
birthday: "", birthday: "",
deptid: "", deptId: "",
deptName: "", deptName: "",
phone: "" phone: ""
} }
...@@ -41,7 +41,7 @@ UserInfoDlg.validateForm = function () { ...@@ -41,7 +41,7 @@ UserInfoDlg.validateForm = function () {
if (!data.name) { if (!data.name) {
return "请输入姓名"; return "请输入姓名";
} }
if (!data.deptid) { if (!data.deptId) {
return "请选择部门"; return "请选择部门";
} }
...@@ -78,7 +78,7 @@ $(function () { ...@@ -78,7 +78,7 @@ $(function () {
}, },
showDeptSelectTree: function () { showDeptSelectTree: function () {
var formName = encodeURIComponent("parent.UserInfoDlg.app.deptName"); var formName = encodeURIComponent("parent.UserInfoDlg.app.deptName");
var formId = encodeURIComponent("parent.UserInfoDlg.app.deptid"); var formId = encodeURIComponent("parent.UserInfoDlg.app.deptId");
var treeUrl = encodeURIComponent(Feng.ctxPath + "/dept/tree"); var treeUrl = encodeURIComponent(Feng.ctxPath + "/dept/tree");
layer.open({ layer.open({
......
src/main/webapp/assets/modular/system/user/user_edit.js
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
*/ */
var UserInfoDlg = { var UserInfoDlg = {
data: { data: {
id: "", userId: "",
account: "", account: "",
sex: "", sex: "",
email: "", email: "",
name: "", name: "",
birthday: "", birthday: "",
deptid: "", deptId: "",
deptName: "", deptName: "",
phone: "", phone: "",
roleName: "" roleName: ""
...@@ -30,7 +30,7 @@ UserInfoDlg.validateForm = function () { ...@@ -30,7 +30,7 @@ UserInfoDlg.validateForm = function () {
var data = UserInfoDlg.data; var data = UserInfoDlg.data;
if (data.account && data.name && data.deptid) { if (data.account && data.name && data.deptId) {
return true; return true;
} }
...@@ -40,7 +40,7 @@ UserInfoDlg.validateForm = function () { ...@@ -40,7 +40,7 @@ UserInfoDlg.validateForm = function () {
if (!data.name) { if (!data.name) {
return "请输入姓名"; return "请输入姓名";
} }
if (!data.deptid) { if (!data.deptId) {
return "请选择部门"; return "请选择部门";
} }
}; };
...@@ -82,7 +82,7 @@ $(function () { ...@@ -82,7 +82,7 @@ $(function () {
}, },
showDeptSelectTree: function () { showDeptSelectTree: function () {
var formName = encodeURIComponent("parent.UserInfoDlg.app.deptName"); var formName = encodeURIComponent("parent.UserInfoDlg.app.deptName");
var formId = encodeURIComponent("parent.UserInfoDlg.app.deptid"); var formId = encodeURIComponent("parent.UserInfoDlg.app.deptId");
var treeUrl = encodeURIComponent(Feng.ctxPath + "/dept/tree"); var treeUrl = encodeURIComponent(Feng.ctxPath + "/dept/tree");
layer.open({ layer.open({
......
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