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

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);

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java

@@ -347,7 +347,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
     /**
      * 发布提醒
      */
-    @AutoLog("发布提醒")
+    @AutoLog(value = "发布提醒",operateType = 2)
     @RequiresPermissions("committeeMeeting:publish")
     @ApiOperation(value = "发布提醒", notes = "发布提醒")
     @PostMapping(value = "/publishReminder")

jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java

@@ -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

@@ -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

@@ -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);