Browse Source

Merge branch 'test2' into test

anderx 1 year ago
parent
commit
c84e8cdc58

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

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

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

@@ -66,7 +66,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
             user.setMyUser(0);
         }
         UserArchives userArchives = queryByUid(id);
-        List<OrganizationContactBook> customerContacts = customerService.findCustomerContacts(id);
+        List<OrganizationContactBook> customerContacts = userMapper.findCustomerContacts(id, TokenManager.getAdminId());
         if (!customerContacts.isEmpty()){
             List<OrganizationContactBook> collect = customerContacts.stream()
                     .filter(e -> e.getMajor() == 1).collect(Collectors.toList());