Parcourir la source

用户档案新增与修改

anderx il y a 1 an
Parent
commit
87bf17a519

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

@@ -203,6 +203,7 @@ create_time = values(create_time)
     <select id="queryByUid" resultMap="UserArchivesMap">
         select
         <include refid="UserArchivesAllSql"/>
+        from user_archives
         where uid = #{id}
     </select>
 </mapper>

+ 3 - 0
src/main/java/com/goafanti/common/model/UserArchives.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -152,6 +154,7 @@ public class UserArchives implements Serializable {
         this.interviewIdeas = interviewIdeas;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -767,7 +767,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 
 	public List<OrganizationContactBook> findCustomerContacts(String uid) {
-		List<OrganizationContactBook> list = userMapper.findCustomerContacts(uid, null);
+		List<OrganizationContactBook> list = userMapper.findCustomerContacts(uid, TokenManager.getAdminId());
 		for (OrganizationContactBook ob : list) {
 			if (!ob.getAid().equals(TokenManager.getAdminId())){
 				ob.setName("***");

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

@@ -15,6 +15,7 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 客户档案表(UserArchives)表服务实现类
@@ -51,7 +52,11 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         UserArchivesDetails user = customerService.selectUserByUid(id);
         UserArchives userArchives = queryByUid(id);
         List<OrganizationContactBook> customerContacts = customerService.findCustomerContacts(id);
-        if (!customerContacts.isEmpty())user.setContactList(customerContacts);
+        if (!customerContacts.isEmpty()){
+            List<OrganizationContactBook> collect = customerContacts.stream()
+                    .filter(e -> e.getMajor() == 1).collect(Collectors.toList());
+            user.setContactList(collect);
+        }
         BeanUtils.copyProperties(userArchives, user);
         return user;
     }