修改部分日志信息

efs-user/src/main/java/com/zjty/efs/user/subject/controller/UserController.java

@@ -170,11 +170,15 @@ public class UserController {
         if (type == 1 ) {
             id = "admin";
             msg = "[管理员]修改了[" + old.getUnit() +
-                    "][" + old.getDepartment() +
-                    "][" + old.getName() +
+                    "_" + old.getName() +
                     "]的信息";
+            efsLogUtil.addLog(new EfsLog(null,id,msg,new Date()));
+        } else {
+            if (type == 2) {
+                msg = userDo.getName() + "修改了账户信息";
+                efsLogUtil.addLog(new EfsLog(null, id, msg, new Date()));
+            }
         }
-        efsLogUtil.addLog(new EfsLog(null,id,msg,new Date()));
         return ResponseEntity.ok(rs);
     }
 

efs-user/src/main/java/com/zjty/efs/user/subject/service/impl/UserServiceImpl.java

@@ -65,8 +65,7 @@ public class UserServiceImpl implements UserService {
         }
         String msg = "[管理员]" + action +
                 "了[" + userDo.getUnit() +
-                "][" + userDo.getDepartment() +
-                "][" + userDo.getName() +
+                "_" + userDo.getName() +
                 "]的账号";
         efsLogUtil.addLog(new EfsLog(null, "admin", msg, new Date()));
         return true;
@@ -93,8 +92,8 @@ public class UserServiceImpl implements UserService {
         userDao.save(userDo);
 
         String msg = "[管理员]重置了" + "["+
-                userDo.getUnit() + "][" + userDo.getDepartment()
-                + "][" + userDo.getName() + "]的密码";
+                userDo.getUnit()
+                + "_" + userDo.getName() + "]的密码";
 
         efsLogUtil.addLog(new EfsLog(null,"admin",
                 msg,
@@ -112,8 +111,7 @@ public class UserServiceImpl implements UserService {
 
             //创建日志
             String msg = "[管理员]用户了[" + userDo.getUnit() +
-                    "][" + userDo.getDepartment() +
-                    "][" + userDo.getName() +
+                    "_" + userDo.getName() +
                     "]";
             efsLogUtil.addLog(new EfsLog(null,"admin",msg, new Date()));
 
@@ -172,8 +170,7 @@ public class UserServiceImpl implements UserService {
 
         //修改记录日志
         String msg = "[" + user.getUnit() +
-                "][" + user.getDepartment() +
-                "][" + user.getName() +
+                "_" + user.getName() +
                 "]修改了密码";
         efsLogUtil.addLog(new EfsLog(null, id, msg, new Date()));
     return user;