ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -849,7 +849,7 @@ request.setMobile(user1.getPhone()); request.setEntercode(tCompany.getEnterCode()); StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request); if ("1".equals(staffNode.getIsValid())) { if (null != staffNode && "1".equals(staffNode.getIsValid())) { DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest(); deleteStafNodeRequest.setEmpId(driver.getEmpId()); deleteStafNodeRequest.setEntercode(tCompany.getEnterCode()); ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java
@@ -2,7 +2,6 @@ import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.constant.dictmap.DeptDict; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.exception.BizExceptionEnum; @@ -59,7 +58,6 @@ /** * 跳转到修改部门 */ @Permission @RequestMapping("/dept_update/{deptId}") public String deptUpdate(@PathVariable Integer deptId, Model model) { Dept dept = deptService.selectById(deptId); @@ -85,7 +83,6 @@ */ @BussinessLog(value = "添加部门", key = "simplename", dict = DeptDict.class) @RequestMapping(value = "/add") @Permission @ResponseBody public Object add(Dept dept) { if (ToolUtil.isOneEmpty(dept, dept.getSimplename())) { @@ -102,7 +99,6 @@ * 获取所有部门列表 */ @RequestMapping(value = "/list") @Permission @ResponseBody public Object list(String condition) { List<Map<String, Object>> list = this.deptService.list(condition); @@ -113,7 +109,6 @@ * 部门详情 */ @RequestMapping(value = "/detail/{deptId}") @Permission @ResponseBody public Object detail(@PathVariable("deptId") Integer deptId) { return deptService.selectById(deptId); @@ -124,7 +119,6 @@ */ @BussinessLog(value = "修改部门", key = "simplename", dict = DeptDict.class) @RequestMapping(value = "/update") @Permission @ResponseBody public Object update(Dept dept) { if (ToolUtil.isEmpty(dept) || dept.getId() == null) { @@ -141,7 +135,6 @@ */ @BussinessLog(value = "删除部门", key = "deptId", dict = DeptDict.class) @RequestMapping(value = "/delete") @Permission @ResponseBody public Object delete(@RequestParam Integer deptId) {
@@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.dictmap.DictMap; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.exception.BizExceptionEnum; @@ -59,7 +57,6 @@ /** * 跳转到修改字典 */ @Permission(Const.ADMIN_NAME) @RequestMapping("/dict_edit/{dictId}") public String deptUpdate(@PathVariable Integer dictId, Model model) { Dict dict = dictService.selectById(dictId); @@ -77,7 +74,6 @@ */ @BussinessLog(value = "添加字典记录", key = "dictName,dictValues", dict = DictMap.class) @RequestMapping(value = "/add") @Permission(Const.ADMIN_NAME) @ResponseBody public Object add(String dictCode,String dictTips,String dictName, String dictValues) { if (ToolUtil.isOneEmpty(dictCode,dictName, dictValues)) { @@ -91,7 +87,6 @@ * 获取所有字典列表 */ @RequestMapping(value = "/list") @Permission(Const.ADMIN_NAME) @ResponseBody public Object list(String condition) { List<Map<String, Object>> list = this.dictService.list(condition); @@ -102,7 +97,6 @@ * 字典详情 */ @RequestMapping(value = "/detail/{dictId}") @Permission(Const.ADMIN_NAME) @ResponseBody public Object detail(@PathVariable("dictId") Integer dictId) { return dictService.selectById(dictId); @@ -113,7 +107,6 @@ */ @BussinessLog(value = "修改字典", key = "dictName,dictValues", dict = DictMap.class) @RequestMapping(value = "/update") @Permission(Const.ADMIN_NAME) @ResponseBody public Object update(Integer dictId,String dictCode,String dictName, String dictTips,String dictValues) { if (ToolUtil.isOneEmpty(dictId, dictCode, dictName, dictValues)) { @@ -128,7 +121,6 @@ */ @BussinessLog(value = "删除字典记录", key = "dictId", dict = DictMap.class) @RequestMapping(value = "/delete") @Permission(Const.ADMIN_NAME) @ResponseBody public Object delete(@RequestParam Integer dictId) {
@@ -1,13 +1,10 @@ package com.stylefeng.guns.modular.system.controller.system; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.SqlRunner; import com.baomidou.mybatisplus.plugins.Page; import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.factory.PageFactory; import com.stylefeng.guns.core.common.constant.state.BizLogType; import com.stylefeng.guns.core.support.BeanKit; @@ -22,8 +19,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.text.SimpleDateFormat; import java.util.Date; @@ -57,7 +52,6 @@ * 查询操作日志列表 */ @RequestMapping("/list") @Permission(Const.ADMIN_NAME) @ResponseBody public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName, @RequestParam(required = false) Integer logType) { Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage(); @@ -70,7 +64,6 @@ * 查询操作日志详情 */ @RequestMapping("/detail/{id}") @Permission(Const.ADMIN_NAME) @ResponseBody public Object detail(@PathVariable Integer id) { OperationLog operationLog = operationLogService.selectById(id); @@ -83,7 +76,6 @@ */ @BussinessLog(value = "清空业务日志") @RequestMapping("/delLog") @Permission(Const.ADMIN_NAME) @ResponseBody public Object delLog() { SqlRunner.db().delete("delete from sys_operation_log"); @@ -95,7 +87,6 @@ * @return */ @RequestMapping("/logBackup") @Permission(Const.ADMIN_NAME) @ResponseBody public Object logBackup(){ List<OperationLog> operationLogs = operationLogService.selectList(null); ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginLogController.java
@@ -5,11 +5,8 @@ import com.baomidou.mybatisplus.plugins.Page; import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.factory.PageFactory; import com.stylefeng.guns.modular.system.model.LoginLog; import com.stylefeng.guns.modular.system.model.OperationLog; import com.stylefeng.guns.modular.system.service.ILoginLogService; import com.stylefeng.guns.modular.system.warpper.LogWarpper; import org.springframework.beans.factory.annotation.Autowired; @@ -52,7 +49,6 @@ * 查询登录日志列表 */ @RequestMapping("/list") @Permission(Const.ADMIN_NAME) @ResponseBody public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName) { Page<LoginLog> page = new PageFactory<LoginLog>().defaultPage(); @@ -66,7 +62,6 @@ */ @BussinessLog("清空登录日志") @RequestMapping("/delLoginLog") @Permission(Const.ADMIN_NAME) @ResponseBody public Object delLog() { SqlRunner.db().delete("delete from sys_login_log"); @@ -80,7 +75,6 @@ * @return */ @RequestMapping("/logBackup") @Permission(Const.ADMIN_NAME) @ResponseBody public Object logBackup(){ List<LoginLog> loginLogs = loginLogService.selectList(null); ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java
@@ -4,8 +4,6 @@ import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.tips.Tip; import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.dictmap.MenuDict; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.state.MenuStatus; @@ -66,7 +64,6 @@ /** * 跳转到菜单详情列表页面 */ @Permission(Const.ADMIN_NAME) @RequestMapping(value = "/menu_edit/{menuId}") public String menuEdit(@PathVariable Long menuId, Model model) { if (ToolUtil.isEmpty(menuId)) { @@ -97,7 +94,6 @@ /** * 修该菜单 */ @Permission(Const.ADMIN_NAME) @RequestMapping(value = "/edit") @BussinessLog(value = "修改菜单", key = "name", dict = MenuDict.class) @ResponseBody @@ -117,7 +113,6 @@ /** * 获取菜单列表 */ @Permission(Const.ADMIN_NAME) @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) { @@ -128,7 +123,6 @@ /** * 新增菜单 */ @Permission(Const.ADMIN_NAME) @RequestMapping(value = "/add") @BussinessLog(value = "菜单新增", key = "name", dict = MenuDict.class) @ResponseBody @@ -156,7 +150,6 @@ /** * 删除菜单 */ @Permission(Const.ADMIN_NAME) @RequestMapping(value = "/remove") @BussinessLog(value = "删除菜单", key = "menuId", dict = MenuDict.class) @ResponseBody ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
@@ -4,7 +4,6 @@ import com.stylefeng.guns.core.base.tips.Tip; import com.stylefeng.guns.core.cache.CacheKit; import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.cache.Cache; import com.stylefeng.guns.core.common.constant.dictmap.RoleDict; @@ -71,7 +70,6 @@ /** * 跳转到修改角色 */ @Permission @RequestMapping(value = "/role_edit/{roleId}") public String roleEdit(@PathVariable Integer roleId, Model model) { if (ToolUtil.isEmpty(roleId)) { @@ -88,7 +86,6 @@ /** * 跳转到角色分配 */ @Permission @RequestMapping(value = "/role_assign/{roleId}") public String roleAssign(@PathVariable("roleId") Integer roleId, Model model) { if (ToolUtil.isEmpty(roleId)) { @@ -102,7 +99,6 @@ /** * 获取角色列表 */ @Permission @RequestMapping(value = "/list") @ResponseBody public Object list(@RequestParam(required = false) String roleName) { @@ -115,7 +111,6 @@ */ @RequestMapping(value = "/add") @BussinessLog(value = "添加角色", key = "name", dict = RoleDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip add(@Valid Role role, BindingResult result) { if (result.hasErrors()) { @@ -133,7 +128,6 @@ */ @RequestMapping(value = "/edit") @BussinessLog(value = "修改角色", key = "name", dict = RoleDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip edit(@Valid Role role, BindingResult result) { if (result.hasErrors()) { @@ -152,7 +146,6 @@ */ @RequestMapping(value = "/remove") @BussinessLog(value = "删除角色", key = "roleId", dict = RoleDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip remove(@RequestParam Integer roleId) { if (ToolUtil.isEmpty(roleId)) { @@ -194,7 +187,6 @@ */ @RequestMapping("/setAuthority") @BussinessLog(value = "配置权限", key = "roleId,ids", dict = RoleDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip setAuthority(@RequestParam("roleId") Integer roleId, @RequestParam("ids") String ids) { if (ToolUtil.isOneEmpty(roleId)) { ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
@@ -1,13 +1,11 @@ package com.stylefeng.guns.modular.system.controller.system; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.stylefeng.guns.config.properties.GunsProperties; import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.tips.Tip; import com.stylefeng.guns.core.beetl.ShiroExtUtil; import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.dictmap.UserDict; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; @@ -30,7 +28,7 @@ import com.stylefeng.guns.modular.system.service.IUserService; import com.stylefeng.guns.modular.system.transfer.UserDto; import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.GetStaffNodeRequest; import com.stylefeng.guns.modular.system.util.qianyuntong.model.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -54,19 +52,22 @@ @Controller @RequestMapping("/mgr") public class UserMgrController extends BaseController { private static String PREFIX = "/system/user/"; @Autowired private GunsProperties gunsProperties; @Autowired private IUserService userService; @Autowired private ITDriverService itDriverService; @Autowired private ITCompanyService companyService; /** * 跳转到查看管理员列表的页面 */ @@ -74,7 +75,7 @@ public String index() { return PREFIX + "user.html"; } /** * 跳转到查看管理员列表的页面 */ @@ -86,8 +87,6 @@ /** * 跳转到角色分配页面 */ //@RequiresPermissions("/mgr/role_assign") //利用shiro自带的权限检查 @Permission @RequestMapping("/role_assign/{userId}") public String roleAssign(@PathVariable Integer userId, Model model) { if (ToolUtil.isEmpty(userId)) { @@ -102,7 +101,6 @@ /** * 跳转到编辑管理员页面 */ @Permission @RequestMapping("/user_edit/{userId}") public String userEdit(@PathVariable Integer userId, Model model) { if (ToolUtil.isEmpty(userId)) { @@ -167,7 +165,6 @@ * 查询管理员列表 */ @RequestMapping("/list") @Permission @ResponseBody public Object list(@RequestParam(required = false) String name, @RequestParam(required = false) String createTime, @RequestParam(required = false) Integer deptid) { //创建日期 @@ -194,33 +191,49 @@ */ @RequestMapping("/add") @BussinessLog(value = "添加管理员", key = "account", dict = UserDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip add(@Valid UserDto user, BindingResult result) { if (result.hasErrors()) { throw new GunsException(BizExceptionEnum.REQUEST_NULL); } // 判断账号是否重复 User theUser = userService.getByAccount(user.getAccount()); if (theUser != null) { throw new GunsException(BizExceptionEnum.USER_ALREADY_REG); } ShiroUser user1 = ShiroExtUtil.getUser(); User user2 = userService.selectById(user1.getId()); TCompany tCompany = companyService.selectById(user2.getObjectId()); SaveStaffNodeRequest request1 = new SaveStaffNodeRequest(); request1.setMobile(user2.getPhone()); request1.setEntercode(tCompany.getEnterCode()); request1.setEmpName(user.getName()); request1.setEmpNickname(user.getName()); request1.setLoginNo(user.getAccount()); request1.setEmpSex(user.getSex() == 1 ? "男" : "女"); request1.setMphone(user.getPhone()); request1.setEmail("qyt@qyt.com"); request1.setDeptId(0); request1.setPositionId(1); request1.setSuperLevel(0); request1.setHideMobile(0); SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request1); Long empId = saveStaffNode.getEmpId(); // 完善账号信息 user.setSalt(ShiroKit.getRandomSalt(5)); user.setPassword(ShiroKit.md5(user.getPassword(), user.getSalt())); user.setStatus(ManagerStatus.OK.getCode()); user.setCreatetime(new Date()); user.setEmpId(empId); user.setEntercode(tCompany.getEnterCode()); user.setEnterId(Long.valueOf(tCompany.getEnterCode())); User objectUser = UserFactory.createUser(user); //查找平台所属公司 TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).orderBy("id", true).last(" limit 1")); if (SinataUtil.isNotEmpty(company)){ objectUser.setObjectId(company.getId()); } objectUser.setObjectId(user1.getObjectId()); this.userService.insert(objectUser); return SUCCESS_TIP; } @@ -233,27 +246,73 @@ @BussinessLog(value = "修改管理员", key = "account", dict = UserDict.class) @ResponseBody public Tip edit(@Valid UserDto user, BindingResult result) throws NoPermissionException { if (result.hasErrors()) { throw new GunsException(BizExceptionEnum.REQUEST_NULL); } User oldUser = userService.selectById(user.getId()); //调用中台接口 GetStaffNodeRequest request = new GetStaffNodeRequest(); EmployeeUtil.getStaffNode(request); if (ShiroExtUtil.getUser().isAdmin) { this.userService.updateById(UserFactory.editUser(user, oldUser)); return SUCCESS_TIP; } else { ShiroUser shiroUser = ShiroExtUtil.getUser(); if (shiroUser.getId().equals(user.getId())) { this.userService.updateById(UserFactory.editUser(user, oldUser)); return SUCCESS_TIP; } else { throw new GunsException(BizExceptionEnum.NO_PERMITION); } if (result.hasErrors()) { throw new GunsException(BizExceptionEnum.REQUEST_NULL); } User oldUser = userService.selectById(user.getId()); ShiroUser user1 = ShiroExtUtil.getUser(); User user2 = userService.selectById(user1.getId()); TCompany tCompany = companyService.selectById(user2.getObjectId()); //调用中台接口 GetStaffNodeRequest request = new GetStaffNodeRequest(); request.setEmpId(oldUser.getEnterId()); request.setMobile(user2.getPhone()); request.setEntercode(tCompany.getEnterCode()); StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request); Long empId = null; if (null == staffNode || "0".equals(staffNode.getIsValid())) { SaveStaffNodeRequest request1 = new SaveStaffNodeRequest(); request1.setMobile(user2.getPhone()); request1.setEntercode(tCompany.getEnterCode()); request1.setEmpName(user.getName()); request1.setEmpNickname(user.getName()); request1.setLoginNo(user.getAccount()); request1.setEmpSex(user.getSex() == 1 ? "男" : "女"); request1.setMphone(user.getPhone()); request1.setEmail("qyt@qyt.com"); request1.setDeptId(0); request1.setPositionId(1); request1.setSuperLevel(0); request1.setHideMobile(0); SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request1); empId = saveStaffNode.getEmpId(); } else { EditStaffNodeRequest request1 = new EditStaffNodeRequest(); request1.setEmpId(staffNode.getEnterId()); request1.setMobile(user2.getPhone()); request1.setEntercode(tCompany.getEnterCode()); request1.setEnterId(Long.valueOf(tCompany.getEnterCode())); request1.setEmpName(user.getName()); request1.setEmpNickname(user.getName()); request1.setLoginNo(user.getAccount()); request1.setEmpSex(user.getSex() == 1 ? "男" : "女"); request1.setMphone(user.getPhone()); request1.setEmail("qyt@qyt.com"); request1.setDeptId(0); request1.setPositionId(1); request1.setSuperLevel(0); request1.setHideMobile(0); EmployeeUtil.editStaffNode(request1); empId = staffNode.getEnterId(); } oldUser.setEmpId(empId); oldUser.setEntercode(tCompany.getEnterCode()); oldUser.setEnterId(Long.valueOf(tCompany.getEnterCode())); user.setEmpId(empId); user.setEntercode(tCompany.getEnterCode()); user.setEnterId(Long.valueOf(tCompany.getEnterCode())); if (ShiroExtUtil.getUser().isAdmin) { this.userService.updateById(UserFactory.editUser(user, oldUser)); return SUCCESS_TIP; } else { ShiroUser shiroUser = ShiroExtUtil.getUser(); if (shiroUser.getId().equals(user.getId())) { this.userService.updateById(UserFactory.editUser(user, oldUser)); return SUCCESS_TIP; } else { throw new GunsException(BizExceptionEnum.NO_PERMITION); } } } @@ -262,7 +321,6 @@ */ @RequestMapping("/delete") @BussinessLog(value = "删除管理员", key = "userId", dict = UserDict.class) @Permission @ResponseBody public Tip delete(@RequestParam Integer userId) { if (ToolUtil.isEmpty(userId)) { @@ -272,8 +330,23 @@ if (userId.equals(Const.ADMIN_ID)) { throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN); } User user = userService.selectById(userId); ShiroUser user1 = ShiroExtUtil.getUser(); User user2 = userService.selectById(user1.getId()); TCompany tCompany = companyService.selectById(user2.getObjectId()); //调用中台接口 GetStaffNodeRequest request = new GetStaffNodeRequest(); request.setEmpId(user.getEnterId()); request.setMobile(user2.getPhone()); request.setEntercode(tCompany.getEnterCode()); StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request); if (null != staffNode && "1".equals(staffNode.getIsValid())) { DeleteStafNodeRequest request1 = new DeleteStafNodeRequest(); request1.setEmpId(user.getEnterId()); request1.setMobile(user2.getPhone()); request1.setEntercode(tCompany.getEnterCode()); EmployeeUtil.ecrmDeleteStafNode(request1); } this.userService.setStatus(userId, ManagerStatus.DELETED.getCode()); return SUCCESS_TIP; } @@ -295,7 +368,6 @@ */ @RequestMapping("/reset") @BussinessLog(value = "重置管理员密码", key = "userId", dict = UserDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip reset(@RequestParam Integer userId) { if (ToolUtil.isEmpty(userId)) { @@ -317,7 +389,6 @@ */ @RequestMapping("/freeze") @BussinessLog(value = "冻结用户", key = "userId", dict = UserDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip freeze(@RequestParam Integer userId) { if (ToolUtil.isEmpty(userId)) { @@ -356,7 +427,6 @@ */ @RequestMapping("/unfreeze") @BussinessLog(value = "解除冻结用户", key = "userId", dict = UserDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip unfreeze(@RequestParam Integer userId) { if (ToolUtil.isEmpty(userId)) { @@ -391,7 +461,6 @@ */ @RequestMapping("/setRole") @BussinessLog(value = "分配角色", key = "userId,roleIds", dict = UserDict.class) @Permission(Const.ADMIN_NAME) @ResponseBody public Tip setRole(@RequestParam("userId") Integer userId, @RequestParam("roleIds") String roleIds) { if (ToolUtil.isOneEmpty(userId, roleIds)) { ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java
@@ -1,7 +1,7 @@ package com.stylefeng.guns.modular.system.model; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; @@ -82,7 +82,7 @@ /** * 保留字段 */ private Integer version; private Integer version; /** * 角色类型 1=平台 2=分公司 3=加盟商 */ @@ -91,15 +91,30 @@ * 对象ID */ private Integer objectId; /** * 中台员工ID */ @TableField("empId") private Long empId; /** * 中台员工所属企业ID */ @TableField("enterId") private Long enterId; /** * 中台员工所属企业编号 */ @TableField("entercode") private String entercode; public Integer getRoleType() { return roleType; } public void setRoleType(Integer roleType) { this.roleType = roleType; } public Integer getObjectId() { return objectId; } @@ -219,24 +234,48 @@ public void setCreatetime(Date createtime) { this.createtime = createtime; } public Integer getVersion() { return version; } public void setVersion(Integer version) { this.version = version; } public Long getEmpId() { return empId; } public void setEmpId(Long empId) { this.empId = empId; } public Long getEnterId() { return enterId; } public void setEnterId(Long enterId) { this.enterId = enterId; } public String getEntercode() { return entercode; } public void setEntercode(String entercode) { this.entercode = entercode; } @Override protected Serializable pkVal() { return this.id; } @Override public String toString() { return "User{" + "id=" + id + "id=" + id + ", avatar=" + avatar + ", account=" + account + ", password=" + password + ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java
@@ -1,5 +1,6 @@ package com.stylefeng.guns.modular.system.transfer; import com.baomidou.mybatisplus.annotations.TableField; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -29,16 +30,31 @@ private Date createtime; private Integer version; private String avatar; /** * 中台员工ID */ @TableField("empId") private Long empId; /** * 中台员工所属企业ID */ @TableField("enterId") private Long enterId; /** * 中台员工所属企业编号 */ @TableField("entercode") private String entercode; public Integer getId() { return id; } public void setId(Integer id) { this.id = id; } public String getAccount() { return account; } @@ -142,12 +158,36 @@ public void setVersion(Integer version) { this.version = version; } public String getAvatar() { return avatar; } public void setAvatar(String avatar) { this.avatar = avatar; } public Long getEmpId() { return empId; } public void setEmpId(Long empId) { this.empId = empId; } public Long getEnterId() { return enterId; } public void setEnterId(Long enterId) { this.enterId = enterId; } public String getEntercode() { return entercode; } public void setEntercode(String entercode) { this.entercode = entercode; } } ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/EditStaffNodeRequest.java
@@ -11,7 +11,7 @@ /** * 人员ID */ private Integer empId; private Long empId; /** * 操作人手机号 */ ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/StaffNodeInfo.java
@@ -11,7 +11,7 @@ /** * 人员ID */ private Integer empId; private Long empId; /** * 主要号码 */ ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html
@@ -8,7 +8,7 @@ <div class="row"> <div class="col-sm-6 b-r"> <#input id="account" name="账户" underline="true" value="${user.account}"/> <#input id="account" name="账户" underline="true" value="${user.account}" readonly="readonly"/> <#select id="sex" name="性别：" underline="true"> <option value="1">男</option>
