需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -170,23 +170,16 @@ public class WorkerManagerLogic {
 
         WebsitUser websitUser = websitUserService.getById(workerManagerBean.getId());
 
-        if (!user.getIdCardEndTime().equals(user.getIdCardEndTime())){
+        if (
+                !(user.getIdCardEndTime().equals(workerManagerBean.getUser().getIdCardEndTime())) ||
+                !(user.getIdCardStartTime().equals(workerManagerBean.getUser().getIdCardStartTime()))){
             WebsitUserLog websitUserLog = new WebsitUserLog();
 
             websitUserLog.setTypeText("身份证修改");
-            websitUserLog.setOpRemark("身份证结束日期变更"+ DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd")+","+
-                    DateUtil.format(workerManagerBean.getUser().getIdCardEndTime(),"yyyy-MM-dd"));
-
-            websitUserLog.setWebsitUserId(workerManagerBean.getId());
-
-            websitUserLog.insert();
-        }
-        if (!user.getIdCardStartTime().equals(user.getIdCardStartTime())){
-            WebsitUserLog websitUserLog = new WebsitUserLog();
-
-            websitUserLog.setTypeText("身份证修改");
-            websitUserLog.setOpRemark("身份证开始日期变更"+ DateUtil.format(user.getIdCardStartTime(),"yyyy-MM-dd")+","+
-                    DateUtil.format(workerManagerBean.getUser().getIdCardStartTime(),"yyyy-MM-dd"));
+            websitUserLog.setOpRemark("原身份证日期"+ DateUtil.format(user.getIdCardStartTime(),"yyyy-MM-dd")+","+
+                    DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd")+"，变更为"+
+                    DateUtil.format(workerManagerBean.getUser().getIdCardStartTime(),"yyyy-MM-dd")+","+
+                            DateUtil.format(workerManagerBean.getUser().getIdCardEndTime(),"yyyy-MM-dd"));
 
             websitUserLog.setWebsitUserId(workerManagerBean.getId());