yaozhixue 1 year ago
parent
commit
d546b40ae7

+ 4 - 2
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -790,7 +790,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         ZJInfo resultZjinfo = new ZJInfo();
         ZJInfoBX zjinfo = new ZJInfoBX();
         Map<String,List<WebsitOrderSign>> wosWebsitidMap = new HashMap<>();
-        WebsitWorker item = null;
+        WebsitWorker item = new WebsitWorker();
 
         // 装入总部同步的保险数据
         zjinfo.setZjInfo(zj);
@@ -807,15 +807,17 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         wos.clear();
 
         // 找出师傅所在网点的保险证记录数据
+        Boolean flag = Boolean.TRUE;
         for (WebsitWorker i:websitWorkerWorkerIdMap.get(workerId)){
             if (wosWebsitidMap.containsKey(i.getWebsitId())){
                 MyBeanUtils.copyProperties(i,item);
+                flag = Boolean.FALSE;
                 break;
             }
         }
 
         // 无保险记录时也不需要处理,这里不用关心记录的事,网点服务人员下载时已生成了数据
-        if (item == null){
+        if (flag){
             return null;
         }
 

+ 6 - 1
src/main/java/com/zfire/jiasm/syncdata/test.java

@@ -111,7 +111,12 @@ public class test {
         SimpleDateFormat sdfs = new SimpleDateFormat("yyyyMM/");
         System.out.println(sdfs.format(new Date()));
 
-
+        String s = "1_p_230720_S9219801_cAwTQeZ4rP-Np3f-2RFN76.png";
+        if (s.contains(",")){
+            System.out.println("有");
+            System.out.println(s);
+        }
+        System.out.println("无");
 
 
     }