LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 40308 日志管理--操作日志--内容回显id

Browse Source
This commit is contained in:
lijiarao
2021-10-20 17:17:47 +08:00
parent 0a7770bdf0
commit 06c709f56a
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
-2
View File
@@ -186,7 +186,6 @@ public class SysAnnouncementSendController {
* @return
*/
@RequiresPermissions("message:read")
@AutoLog(value = "我的消息-已读",operateType = 3)
@PostMapping(value = "/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
@@ -207,7 +206,6 @@ public class SysAnnouncementSendController {
* @param json
* @return
*/
@AutoLog(value = "我的消息-已读")
@PostMapping(value = "/editCompanyByAnntIdAndUserId")
public Result<SysAnnouncementSend> editCompanyByAnntIdAndUserId(@RequestBody JSONObject json) {
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+6 -2
View File
@@ -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<SysUser> sysUsers = sysUserService.listByIds(Arrays.asList(ids.split(",")));
List<String> 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("批量删除用户成功");
}
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
+3
View File
@@ -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);