Browse Source

单位公共客户列表,单位客户查询列表,判定我的客户的逻辑修改成判定日志中操作逻辑是我的

anderx 8 months ago
parent
commit
43304b2b0e

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

@@ -166,7 +166,8 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByUidGetList" resultType="com.goafanti.customer.bo.transferListBo">
-	select a.id,a.type,b.nickname userName,c.name usedAName,d.name newAName,e.bname Pname, 
+	select a.id,a.type,b.nickname userName,c.name usedAName,d.name newAName,e.bname Pname,
+	       a.aid,a.uid,a.take_aid takeAid,
   	date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createDate,remarks
   	from user_transfer_log a left join user b on a.uid=b.id
 	left join admin c on a.aid=c.id left join admin d on a.take_aid=d.id

+ 29 - 0
src/main/java/com/goafanti/customer/bo/transferListBo.java

@@ -9,6 +9,35 @@ public class transferListBo {
 	private String pName;
 	private String createDate;
 	private String remarks;
+
+	private String aid;
+	private String uid;
+	private String takeAid;
+
+	public String getAid() {
+		return aid;
+	}
+
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getTakeAid() {
+		return takeAid;
+	}
+
+	public void setTakeAid(String takeAid) {
+		this.takeAid = takeAid;
+	}
+
 	public Integer getId() {
 		return id;
 	}

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

@@ -38,6 +38,7 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Service
@@ -216,7 +217,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				"selectPublicOrganizationCustomerCount", params, pageNo, pageSize);
 		List<CustomerListOut> list = (List<CustomerListOut>) page.getList();
 		list.forEach(e -> {
-			if (e.getAid().equals(TokenManager.getAdminId())){
+			List<transferListBo> transferListBos = userTransferLogMapper.selectByUidGetList(e.getUid());
+			//去重获取aid的List
+			List<String> alist = transferListBos.stream().map(e2 -> e2.getAid()).distinct().collect(Collectors.toList());
+			//判定alist里面是否含有当前用户
+			boolean flag = alist.contains(TokenManager.getAdminId());
+			if (flag){
 				e.setMyUser(1);
 			}
 		});
@@ -260,9 +266,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		for (CustomerListOut c : l) {
 			if (null != c) {
 				if (null != c.getAid()) c.setAdminName(adminMapper.selectNameByid(c.getAid()));
-				if (c.getAid().equals(TokenManager.getAdminId())) c.setMyUser(1);
 				if (null != c.getShareType() && c.getShareType().equals("1")) c.setAdminName("暂无");
 				if (null != c.getMid()) c.setInformationMaintainer(adminMapper.selectNameByid(c.getMid()));
+				List<transferListBo> transferListBos = userTransferLogMapper.selectByUidGetList(c.getUid());
+				//去重获取aid的List
+				List<String> alist = transferListBos.stream().map(e2 -> e2.getAid()).distinct().collect(Collectors.toList());
+				//判定alist里面是否含有当前用户
+				boolean flag = alist.contains(TokenManager.getAdminId());
+				if (flag){
+					c.setMyUser(1);
+				}
 			}
 		}
 		return p;