1

src/main/java/com/pangding/web/authority/controller/DataController.java

 package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.service.DataService;
+import com.pangding.web.authority.vo.reqvo.DataSynReqVo;
 import com.pangding.web.authority.vo.resvo.FindResVo;
 import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
 import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
@@ -39,4 +40,10 @@ public class DataController {
         dataServiceImpl.saveOrderStepOne(reqVo);
         return new ResponseResult();
     }
+
+    @PostMapping(value = "/dataSyn",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult dataSyn(@RequestBody DataSynReqVo reqVo){
+        dataServiceImpl.dataSyn(reqVo);
+        return new ResponseResult();
+    }
 }

src/main/java/com/pangding/web/authority/service/DataService.java

 package com.pangding.web.authority.service;
 
+import com.pangding.web.authority.vo.reqvo.DataSynReqVo;
 import com.pangding.web.authority.vo.resvo.FindResVo;
 import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
 import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
@@ -15,4 +16,6 @@ public interface DataService {
     void saveOrderStepThree(OrderStepThreeResVo reqVo);
 
     void saveOrderStepOne(OrderStepOneResVo reqVo);
+
+    void dataSyn(DataSynReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java

@@ -260,7 +260,12 @@ public class AuthorityServiceImpl implements AuthorityService {
                 AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
                 authorityGetReqVo.setId(authorityVo.getPid());
                 AuthorityVo parent = authorityDao.load(authorityGetReqVo,AuthorityVo.class);
-                resVo.setParentName(parent.getName());
+                if(!StringHelper.isEmpty(parent)){
+                    resVo.setParentName(parent.getName());
+                }else{
+                    System.out.println("id:" + authorityVo.getPid());
+                }
+
             }
             webAuthorityResVoList.add(resVo);
         }
@@ -289,7 +294,7 @@ public class AuthorityServiceImpl implements AuthorityService {
         roleGetReqVo.setCompanyId(reqVo.getCompanyId());
         roleGetReqVo.setIsAdmin(1);
         RoleVo roleVo = roleDaoImpl.load(roleGetReqVo,RoleVo.class);
-        if (roleVo == null){
+        if (StringHelper.isEmpty(roleVo)){
             throw new CodeException("该公司用户未设置管理员角色");
         }
         Set authorityIdSet = new HashSet();
@@ -311,7 +316,7 @@ public class AuthorityServiceImpl implements AuthorityService {
             AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
             authorityGetReqVo.setId(authorityIdList.get(i));
             AuthorityVo authorityVo = authorityDao.load(authorityGetReqVo,AuthorityVo.class);
-            if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){
+            if (!StringHelper.isEmpty(authorityVo) && StringHelper.isEmpty(authorityVo.getPid())){
                 levelOneList.add(authorityVo);
                 authorityIdList.set(i,"");
             }

src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java

@@ -522,17 +522,22 @@ public class RegisterServiceImpl implements RegisterService {
             AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
             authorityGetReqVo.setId(authorityIds.get(i));
             AuthorityVo authorityVo1 = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
-            if (authorityVo1.getPid().equals(authorityVo.getId())){
-                List<String> authorityIdList = new ArrayList<>();
-                authorityIdList.addAll(authorityIds);
-                authorityIdList.remove(i);
-                AuthorityListByLevelResVo resVo = new AuthorityListByLevelResVo();
-                ObjectHelper.writeWithFrom(resVo,authorityVo1);
-                if (authorityIds.size()>0){
-                    resVo.setChildList(getChildList(authorityVo1,authorityIdList));
+            if(!StringHelper.isEmpty(authorityVo1)){
+                if (authorityVo1.getPid().equals(authorityVo.getId())){
+                    List<String> authorityIdList = new ArrayList<>();
+                    authorityIdList.addAll(authorityIds);
+                    authorityIdList.remove(i);
+                    AuthorityListByLevelResVo resVo = new AuthorityListByLevelResVo();
+                    ObjectHelper.writeWithFrom(resVo,authorityVo1);
+                    if (authorityIds.size()>0){
+                        resVo.setChildList(getChildList(authorityVo1,authorityIdList));
+                    }
+                    resVoList.add(resVo);
                 }
-                resVoList.add(resVo);
+            }else{
+                System.out.println("无该权限：" + authorityIds.get(i));
             }
+
         }
         Collections.sort(resVoList);
         return resVoList;

src/main/java/com/pangding/web/authority/vo/TyyOrderMixVo.java

@@ -16,6 +16,7 @@ public class TyyOrderMixVo {
     private String paytype;
     private String paymenttime;
     private String paystatus;
+    private String queryid;
     private String order_status;
     private String piaostorderid;
     private String memberid;
@@ -356,4 +357,12 @@ public class TyyOrderMixVo {
     public void setProduct_company_id(String product_company_id) {
         this.product_company_id = product_company_id;
     }
+
+    public String getQueryid() {
+        return queryid;
+    }
+
+    public void setQueryid(String queryid) {
+        this.queryid = queryid;
+    }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/DataSynReqVo.java

 package com.pangding.web.authority.vo.reqvo;
 
+import com.pangding.web.authority.vo.*;
+
+import java.util.List;
+
+/**
+ * tf
+ */
 public class DataSynReqVo {
+
+    private TyyOrderVo tyyOrderVo;
+
+    private TyyOrdersVo tyyOrdersVo;
+
+    private List<TyyOrderdetailsVo> orderdetailsVoList;
+
+    private List<TyyTouristVo> touristVoList;
+
+    private List<TyyOrderbackVo> orderbackVoList;
+
+
+    public TyyOrderVo getTyyOrderVo() {
+        return tyyOrderVo;
+    }
+
+    public void setTyyOrderVo(TyyOrderVo tyyOrderVo) {
+        this.tyyOrderVo = tyyOrderVo;
+    }
+
+    public TyyOrdersVo getTyyOrdersVo() {
+        return tyyOrdersVo;
+    }
+
+    public void setTyyOrdersVo(TyyOrdersVo tyyOrdersVo) {
+        this.tyyOrdersVo = tyyOrdersVo;
+    }
+
+    public List<TyyOrderdetailsVo> getOrderdetailsVoList() {
+        return orderdetailsVoList;
+    }
+
+    public void setOrderdetailsVoList(List<TyyOrderdetailsVo> orderdetailsVoList) {
+        this.orderdetailsVoList = orderdetailsVoList;
+    }
+
+    public List<TyyTouristVo> getTouristVoList() {
+        return touristVoList;
+    }
+
+    public void setTouristVoList(List<TyyTouristVo> touristVoList) {
+        this.touristVoList = touristVoList;
+    }
+
+    public List<TyyOrderbackVo> getOrderbackVoList() {
+        return orderbackVoList;
+    }
+
+    public void setOrderbackVoList(List<TyyOrderbackVo> orderbackVoList) {
+        this.orderbackVoList = orderbackVoList;
+    }
 }

src/main/java/com/pangding/web/authority/vo/resvo/OrderStepOneResVo.java

@@ -17,9 +17,9 @@ public class OrderStepOneResVo {
 
     private List<TyyOrderbackVo> tyyOrderbackVoList;
 
-    private TyyOrderdetailsVo tyyOrderdetailsVo;
+    private List<TyyOrderdetailsVo> tyyOrderdetailsVoList;
 
-    private TyyTouristVo tyyTouristVo;
+    private List<TyyTouristVo> tyyTouristVoList;
 
     public String getReqId() {
         return reqId;
@@ -53,19 +53,19 @@ public class OrderStepOneResVo {
         this.tyyOrderbackVoList = tyyOrderbackVoList;
     }
 
-    public TyyOrderdetailsVo getTyyOrderdetailsVo() {
-        return tyyOrderdetailsVo;
+    public List<TyyOrderdetailsVo> getTyyOrderdetailsVoList() {
+        return tyyOrderdetailsVoList;
     }
 
-    public void setTyyOrderdetailsVo(TyyOrderdetailsVo tyyOrderdetailsVo) {
-        this.tyyOrderdetailsVo = tyyOrderdetailsVo;
+    public void setTyyOrderdetailsVoList(List<TyyOrderdetailsVo> tyyOrderdetailsVoList) {
+        this.tyyOrderdetailsVoList = tyyOrderdetailsVoList;
     }
 
-    public TyyTouristVo getTyyTouristVo() {
-        return tyyTouristVo;
+    public List<TyyTouristVo> getTyyTouristVoList() {
+        return tyyTouristVoList;
     }
 
-    public void setTyyTouristVo(TyyTouristVo tyyTouristVo) {
-        this.tyyTouristVo = tyyTouristVo;
+    public void setTyyTouristVoList(List<TyyTouristVo> tyyTouristVoList) {
+        this.tyyTouristVoList = tyyTouristVoList;
     }
 }