add

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -2849,13 +2849,17 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
         if (worker !=null){
             // 提取网点师傅ID
-            WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
+            /*WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
             if (ww !=null ){
                 orderBase.setWorkerId(ww.getWebsitWorkerId());
                 orderBase.setWorkerName(worker.getWorkerName());
                 orderBase.setWorkerMobile(worker.getMobile());
                 orderBase.setWorkerIdcard(worker.getIdcard());
-            }
+            }*/
+            orderBase.setWorkerId(worker.getWorkerId());
+            orderBase.setWorkerName(worker.getWorkerName());
+            orderBase.setWorkerMobile(worker.getMobile());
+            orderBase.setWorkerIdcard(worker.getIdcard());
         }
 
         return orderBase;
@@ -2905,15 +2909,20 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
         if (worker !=null){
             // 提取网点师傅ID
-            WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
+            /*WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
             if (ww !=null ){
                 orderBase.setWorkerId(ww.getWebsitWorkerId());
                 orderBase.setWorkerName(worker.getWorkerName());
                 orderBase.setWorkerMobile(worker.getMobile());
                 orderBase.setWorkerIdcard(worker.getIdcard());
-            }
+            }*/
+            orderBase.setWorkerId(worker.getWorkerId());
+            orderBase.setWorkerName(worker.getWorkerName());
+            orderBase.setWorkerMobile(worker.getMobile());
+            orderBase.setWorkerIdcard(worker.getIdcard());
         }
 
+
         return orderBase;
     }
 
@@ -2933,13 +2942,17 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
         if (worker !=null){
             // 提取网点师傅ID
-            WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
+            /*WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
             if (ww !=null ){
                 orderBase.setWorkerId(ww.getWebsitWorkerId());
                 orderBase.setWorkerName(worker.getWorkerName());
                 orderBase.setWorkerMobile(worker.getMobile());
                 orderBase.setWorkerIdcard(worker.getIdcard());
-            }
+            }*/
+            orderBase.setWorkerId(worker.getWorkerId());
+            orderBase.setWorkerName(worker.getWorkerName());
+            orderBase.setWorkerMobile(worker.getMobile());
+            orderBase.setWorkerIdcard(worker.getIdcard());
         }
 
         return orderBase;
@@ -2967,13 +2980,17 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         Worker worker= publicService.getInstallOrderWorker(item.getAzrenid());
         if (worker !=null){
             // 提取网点师傅ID
-            WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
+            /*WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),orderBase.getWebsitId());
             if (ww !=null ){
                 orderBase.setWorkerId(ww.getWebsitWorkerId());
                 orderBase.setWorkerName(worker.getWorkerName());
                 orderBase.setWorkerMobile(worker.getMobile());
                 orderBase.setWorkerIdcard(worker.getIdcard());
-            }
+            }*/
+            orderBase.setWorkerId(worker.getWorkerId());
+            orderBase.setWorkerName(worker.getWorkerName());
+            orderBase.setWorkerMobile(worker.getMobile());
+            orderBase.setWorkerIdcard(worker.getIdcard());
         }
 
         return orderBase;