diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index c11fb05d..088eb5fa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -146,6 +146,9 @@ public class CompanyLoginController { //update-begin--Author:wangshuai Date:20200714 for:登录日志没有记录人员 LoginUser loginUser = new LoginUser(); BeanUtils.copyProperties(contactsManagement, loginUser); + loginUser.setUsername(contactsManagement.getName()); + loginUser.setRealname(contactsManagement.getName()); + loginUser.setRoleCode("企业用户"); baseCommonService.addLog("手机号: " + phone + ",登录成功!", CommonConstant.LOG_TYPE_1, null, loginUser); //update-end--Author:wangshuai Date:20200714 for:登录日志没有记录人员 return result; @@ -267,7 +270,7 @@ public class CompanyLoginController { }else if (!Objects.equals(contactsManagement1.getPhone(),contactsManagement.getPhone())){ throw new JeroBootException("微信已经绑定过其他账号"); } - baseCommonService.addLog("手机号: " + contactsManagement.getPhone() + ",绑定微信成功!", CommonConstant.LOG_TYPE_2, CommonConstant.OPERATE_TYPE_3, loginUser); + baseCommonService.addLog("手机号: " + PasswordUtil.decrypt(contactsManagement.getPhone()) + ",绑定微信成功!", CommonConstant.LOG_TYPE_2, CommonConstant.OPERATE_TYPE_3, loginUser); //update-end--Author:wangshuai Date:20200714 for:登录日志没有记录人员 return Result.OK("绑定微信成功"); } @@ -308,7 +311,7 @@ public class CompanyLoginController { queryWrapper.eq(PayContactsManagement::getPhone, phone); PayContactsManagement contactsManagement = payContactsManagementService.getOne(queryWrapper); if (contactsManagement != null) { - baseCommonService.addLog("用户名: " + contactsManagement.getName() + ",退出成功!", CommonConstant.LOG_TYPE_1, null, null); + baseCommonService.addLog("手机号: " + PasswordUtil.decrypt(phone) + ",退出成功!", CommonConstant.LOG_TYPE_1, null, null); log.info(" 企业端用户: " + contactsManagement.getName() + ",退出成功! "); //清空用户登录Token缓存 redisUtil.del(CommonConstant.PREFIX_USER_TOKEN + token); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index c517499a..d9523d6a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -347,7 +347,7 @@ public class CommitteeMeetingController extends JeroController editById(@RequestBody JSONObject json) { Result result = new Result(); @@ -207,7 +206,6 @@ public class SysAnnouncementSendController { * @param json * @return */ - @AutoLog(value = "我的消息-已读") @PostMapping(value = "/editCompanyByAnntIdAndUserId") public Result editCompanyByAnntIdAndUserId(@RequestBody JSONObject json) { Result result = new Result(); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index b63e3aec..0b7b5015 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -431,7 +431,8 @@ public class SysUserController { @RequiresPermissions("sys:user:del") @RequestMapping(value = "/delete", method = RequestMethod.GET) public Result delete(@RequestParam(name="id",required=true) String id) { - baseCommonService.addLog("删除用户,id: " +id ,CommonConstant.LOG_TYPE_2, 3); + SysUser sysUser = sysUserService.getById(id); + baseCommonService.addLog("删除用户: " +sysUser.getUsername() ,CommonConstant.LOG_TYPE_2, 4); this.sysUserService.deleteUser(id); return Result.OK("删除用户成功"); } @@ -443,7 +444,10 @@ public class SysUserController { @RequiresPermissions("sys:user:del") @RequestMapping(value = "/deleteBatch", method = RequestMethod.GET) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - baseCommonService.addLog("批量删除用户, ids: " +ids ,CommonConstant.LOG_TYPE_2, 3); + List sysUsers = sysUserService.listByIds(Arrays.asList(ids.split(","))); + List userNames = new ArrayList<>(); + sysUsers.forEach(i -> userNames.add(i.getUsername())); + baseCommonService.addLog("批量删除用户: " +userNames ,CommonConstant.LOG_TYPE_2, 4); this.sysUserService.deleteBatchUsers(ids); return Result.OK("批量删除用户成功"); } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java index 87f94a6a..375f15d2 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java @@ -119,6 +119,9 @@ public class SysBaseApiImpl implements ISysBaseAPI { }else { BeanUtils.copyProperties(contactsManagement, loginUser); loginUser.setIsCompanyUser(true); + loginUser.setUsername(contactsManagement.getName()); + loginUser.setRealname(contactsManagement.getName()); + loginUser.setRoleCode("企业用户"); } }else { BeanUtils.copyProperties(sysUser, loginUser);