Merge branch 'pre' into 'master'

代理 state 代理

See merge request !333

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -361,6 +361,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 userData.setPhone(smilePrice.getPhone());
                 userData.setIdCard(smilePrice.getIdCard());
                 userData.setAgentName(smilePrice.getName());
+                userData.setState(0);
                 userDataList.add(userData);
                 ids.add(userData.getUid());
             }
@@ -686,7 +687,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             }
             arrayList.add(userData.getIdCard());
             arrayList.add(userData.getPhone());
-            if(userData.getState()==0){
+            if (userData.getState() == null) {
+                arrayList.add("未知");
+            } else if (userData.getState() == 0) {
                 arrayList.add("正常");
             } else if(userData.getState()==1){
                 arrayList.add("黑名单");