fix(单位模块): 修改更新人员信息的时候日志

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/UserLog.java

 package com.tykj.dev.device.user.subject.entity;
 
+import com.tykj.dev.misc.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -19,17 +20,12 @@ import java.util.Date;
  * @Description 用户日志对象
  * @createTime 2020年12月01日 14:37:00
  */
-@AllArgsConstructor
 @NoArgsConstructor
 @Data
 @Entity
 @ApiModel(value = "用户日志对象", description = "用户log")
-public class UserLog {
-    @Id
-    @GeneratedValue
-    @ApiModelProperty(value = "id", name = "id")
-    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
-    private Integer id;
+public class UserLog extends BaseEntity {
+
     @ApiModelProperty(value = "用户id", name = "userId")
     private Integer userId;
     @ApiModelProperty(value = "时间", name = "time")
@@ -37,6 +33,8 @@ public class UserLog {
     @ApiModelProperty(value = "内容", name = "content")
     private String content;
 
+
+
     public UserLog(Integer userId, Date time, String content) {
         this.userId = userId;
         this.time = time;

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -170,32 +170,32 @@ public class UserServiceImpl implements UserService {
     public User update(User user) {
         User oldUser=userCache.findById(user.getUserId());
         if (!oldUser.getName().equals(user.getName())){
-            userLogService.save(new UserLog(userUtils.getCurrentUserId(),new Date(),"修改信息 名称:"+oldUser.getName()+"->"+user.getName()));
+            userLogService.save(new UserLog(user.getUserId(),new Date(),"修改信息 名称:"+oldUser.getName()+"->"+user.getName()));
 
         }
         if (!oldUser.getMobile().equals(user.getMobile())){
-            userLogService.save(new UserLog(userUtils.getCurrentUserId(),new Date(),"修改信息 手机号码:"+oldUser.getMobile()+"->"+user.getMobile()));
+            userLogService.save(new UserLog(user.getUserId(),new Date(),"修改信息 手机号码:"+oldUser.getMobile()+"->"+user.getMobile()));
 
         }
         if (!oldUser.getSex().equals(user.getSex())){
-            userLogService.save(new UserLog(userUtils.getCurrentUserId(),new Date(),"修改信息 性别:"+(oldUser.getSex()==0 ? "男" : "女")+"->"+(user.getSex()==0 ? "男" : "女")));
+            userLogService.save(new UserLog(user.getUserId(),new Date(),"修改信息 性别:"+(oldUser.getSex()==0 ? "男" : "女")+"->"+(user.getSex()==0 ? "男" : "女")));
 
         }
         if (!oldUser.getPosition().equals(user.getPosition())){
 
-            userLogService.save(new UserLog(userUtils.getCurrentUserId(),new Date(),"修改信息 职位:"+ (oldUser.getPosition()==0 ? "领导" : "职员")+"->"+(user.getPosition()==0 ? "领导" : "职员")));
+            userLogService.save(new UserLog(user.getUserId(),new Date(),"修改信息 职位:"+ (oldUser.getPosition()==0 ? "领导" : "职员")+"->"+(user.getPosition()==0 ? "领导" : "职员")));
 
         }
         if (!oldUser.getEmail().equals(user.getEmail())){
-            userLogService.save(new UserLog(userUtils.getCurrentUserId(),new Date(),"修改信息 邮箱:"+oldUser.getEmail()+"->"+user.getEmail()));
+            userLogService.save(new UserLog(user.getUserId(),new Date(),"修改信息 邮箱:"+oldUser.getEmail()+"->"+user.getEmail()));
 
         }
         if (!oldUser.getIdCard().equals(user.getIdCard())){
-            userLogService.save(new UserLog(userUtils.getCurrentUserId(),new Date(),"修改信息 身份证:"+oldUser.getIdCard()+"->"+user.getIdCard()));
+            userLogService.save(new UserLog(user.getUserId(),new Date(),"修改信息 身份证:"+oldUser.getIdCard()+"->"+user.getIdCard()));
 
         }
         if (!oldUser.getTelphone().equals(user.getTelphone())){
-            userLogService.save(new UserLog(userUtils.getCurrentUserId(),new Date(),"修改信息 固定电话:"+oldUser.getTelphone()+"->"+user.getTelphone()));
+            userLogService.save(new UserLog(user.getUserId(),new Date(),"修改信息 固定电话:"+oldUser.getTelphone()+"->"+user.getTelphone()));
 
         }
         user.setNoPassword(oldUser.getNoPassword());