|
|
@@ -13,10 +13,7 @@ import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -182,17 +179,17 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
UserArchives use = userArchivesMapper.queryById(userArchives.getId());
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
List<UserDataLog> list =new ArrayList<>();
|
|
|
- if(userArchives.getFinancialData()!=null&&!use.getFinancialData().equals(userArchives.getFinancialData())){
|
|
|
+ if(userArchives.getFinancialData()!=null&&!Objects.equals(use.getFinancialData(),userArchives.getFinancialData())){
|
|
|
String builder = admin.getName() + "修改了财务数据: " + use.getFinancialData() + "=>" + userArchives.getFinancialData();
|
|
|
UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,1);
|
|
|
list.add(userDataLog);
|
|
|
}
|
|
|
- if (userArchives.getEarlyCommunication()!=null&&!use.getEarlyCommunication().equals(userArchives.getEarlyCommunication())){
|
|
|
+ if (userArchives.getEarlyCommunication()!=null&&!Objects.equals(use.getEarlyCommunication(),userArchives.getEarlyCommunication())){
|
|
|
String builder = admin.getName() + "修改了前期沟通: " + use.getEarlyCommunication() + "=>" + userArchives.getEarlyCommunication();
|
|
|
UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,2);
|
|
|
list.add(userDataLog);
|
|
|
}
|
|
|
- if (userArchives.getInterviewIdeas()!=null&&!use.getInterviewIdeas().equals(userArchives.getInterviewIdeas())){
|
|
|
+ if (userArchives.getInterviewIdeas()!=null&&!Objects.equals(use.getInterviewIdeas(),userArchives.getInterviewIdeas())){
|
|
|
String builder = admin.getName() + "修改了面谈思路: " + use.getInterviewIdeas() + "=>" + userArchives.getInterviewIdeas();
|
|
|
UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,3);
|
|
|
list.add(userDataLog);
|