Просмотр исходного кода

用户档案记录修改记录提交

anderx 1 год назад
Родитель
Сommit
31d6c9df47

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserDataLogMapper.xml

@@ -78,7 +78,7 @@
         values (#{uid}, #{createTime}, #{remarks}, #{type})
     </insert>
 
-    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
+    <insert id="insertBatch" >
         insert into user_data_log(uid, create_time, remarks, type)
         values
         <foreach collection="entities" item="entity" separator=",">

+ 3 - 3
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -181,17 +181,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(!use.getFinancialData().equals(userArchives.getFinancialData())){
+        if(userArchives.getFinancialData()!=null&&!use.getFinancialData().equals(userArchives.getFinancialData())){
             String builder = admin.getName() + "修改了财务数据: " + use.getFinancialData() + "=>" + userArchives.getFinancialData();
             UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,1);
             list.add(userDataLog);
         }
-        if (!use.getEarlyCommunication().equals(userArchives.getEarlyCommunication())){
+        if (userArchives.getEarlyCommunication()!=null&&!use.getEarlyCommunication().equals(userArchives.getEarlyCommunication())){
             String builder = admin.getName() + "修改了前期沟通: " + use.getEarlyCommunication() + "=>" + userArchives.getEarlyCommunication();
             UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,2);
             list.add(userDataLog);
         }
-        if (!use.getInterviewIdeas().equals(userArchives.getInterviewIdeas())){
+        if (userArchives.getInterviewIdeas()!=null&&!use.getInterviewIdeas().equals(userArchives.getInterviewIdeas())){
             String builder = admin.getName() + "修改了面谈思路: " + use.getInterviewIdeas() + "=>" + userArchives.getInterviewIdeas();
             UserDataLog userDataLog = new UserDataLog(userArchives.getUid(), builder,3);
             list.add(userDataLog);