消费改造-人员同步筛选

renren-api/src/main/java/io/renren/controller/CardController.java

@@ -406,8 +406,9 @@ public class CardController {
         people.setDelFlag(0L);
         people.setEquipmentId(equipment.getId()+"");
         people.setPageNo(20);
+        people.setConsumeStats(1);
         List<SysPeople> sysPeopleList = peopleService.selectSysPeopleList(people);
-        if(sysPeopleList!=null&&sysPeopleList.size()>0){
+        if (CollUtil.isNotEmpty(sysPeopleList)) {
             card.setApi("addperson");
             JSONArray whitelist = new JSONArray();
             for (SysPeople p : sysPeopleList) {

renren-api/src/main/java/io/renren/entity/SysPeople.java

@@ -100,6 +100,15 @@ public class SysPeople extends BaseEntity {
 
 	private String isConsume;
 
+	private Integer consumeStats;
+
+	public Integer getConsumeStats() {
+		return consumeStats;
+	}
+
+	public void setConsumeStats(Integer consumeStats) {
+		this.consumeStats = consumeStats;
+	}
 
 	public String getOpenid() {
 		return openid;

renren-api/src/main/resources/mapper/SysPeopleMapper.xml

@@ -69,6 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="branchId != null ">
                 AND (p.branch_id = #{branchId} OR p.branch_id IN ( SELECT t.id FROM sys_branch t WHERE find_in_set(#{branchId}, ancestors) ))
             </if>
+            <if test="consumeStats != null ">
+                AND (p.avatar is not null or p.door_no is not null)
+            </if>
             <if test="delFlag != null">
                 <if test="delFlag == 0">
                     <if test="equipmentId != null  and equipmentId != ''"> and spe.equipment_id is  null </if>