公共资源搜索功能： 存在搜索词，则搜索全部客户，检索结果如果已有跟进人则填充 已有人跟进标识

src/main/java/com/mapper/customer/CustomerMapper.java

@@ -18,7 +18,8 @@ public interface CustomerMapper extends BaseMapper<Customer>{
 			+ " eq(c.hasBusiness, form.hasBusiness) "
 			+ " eq(c.central, form.central) "
 			+ " eq(c.signing, form.signing) "
-			+ " <if test = 'form.hasUser == \"1\"'> "
+			// 用户无输入并且检索未分配人员时,仅搜索未分配人员
+			 + " <if test = 'form.hasUser == \"1\" and "+ BLANK +" (form.text) '> "
 			+ " and (c.userId is null or c.userId ='' )  "
 			+ " </if> "
 			+ " <if test = 'form.hasUser == \"2\"'> "

src/main/java/com/service/customer/CustomerServiceImpl.java

@@ -40,6 +40,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<Customer, Integer> impl
 			t.setHasBusinessZh(CustomerHasBusinessEnum.getName(r.getHasBusiness()));
 			t.setCentralZh(BooleanStatusEnum.getName(r.getCentral()));
 			t.setSigningZh(CustomerSigningEnum.getName(r.getSigning()));
+			if ("1".equals(form.getHasUser()) && StringUtils.isNotBlank(form.getText())) {
+				// 检索公共资源
+				if (StringUtils.isNotBlank(t.getUserId())) {
+					t.setUserName("已有人跟进");
+				}
+			}
 		});
 		return new PageInfo<>(list, result);
 	}