add

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

@@ -500,9 +500,6 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                         if (wdsy.getSpxl()!=null){
                             one.setSpxl(wdsy.getSpxl());
                             one.setSpxlName(wdsy.getSpxlName());
-                        } else if (sy.getSpxl()!=null){
-                            one.setSpxl(sy.getSpxl());
-                            one.setSpxlName(sy.getSpxlName());
                         }
                         syList.add(one);
                         break;
@@ -524,12 +521,10 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                         one.setFwlbList(jyfwlbList);
                         one.setSpdl(wdjy.getSpdl());
                         one.setSpdlName(wdjy.getSpdlName());
+                        // 小类存在取总部小类数据
                         if (wdjy.getSpxl()!=null){
                             one.setSpxl(wdjy.getSpxl());
                             one.setSpxlName(wdjy.getSpxlName());
-                        } else if (jy.getSpxl()!=null){
-                            one.setSpxl(jy.getSpxl());
-                            one.setSpxlName(jy.getSpxlName());
                         }
                         jyList.add(one);
                         break;