Merge branch 'feature/relation_type_item' of http://47.101.143.145:8090/77975466/pco into feature/relation_type_item

sp-admin/sa-view/tb-fee-statistics/dayStatsPrint.html

@@ -161,7 +161,12 @@
         )
         $("#dp").append(html.join(''));
 
-        $("#time").html("期间：" + data.data.time);
+        if(data.data.time != null){
+          $("#time").html("期间：" + data.data.time);
+        }else {
+          $("#time").html("期间：所有时间" );
+        }
+
 
 
         $("#myPrintArea").printArea();

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessController.java

@@ -13,6 +13,8 @@ import com.pj.project.tb_business_car.TbBusinessCar;
 import com.pj.project.tb_business_car.TbBusinessCarService;
 import com.pj.project.tb_business_item.TbBusinessItem;
 import com.pj.project.tb_business_item.TbBusinessItemService;
+import com.pj.project.tb_costomer.TbCostomer;
+import com.pj.project.tb_costomer.TbCostomerService;
 import com.pj.project.tb_declare.TbDeclareService;
 import com.pj.project.tb_item.TbItem;
 import com.pj.project.tb_notices.TbNoticesService;
@@ -51,6 +53,8 @@ public class TbBusinessController {
     private TbBusinessCarService tbBusinessCarService;
     @Resource
     private TbDeclareService tbDeclareService;
+    @Resource
+    private TbCostomerService tbCostomerService;
 
 
     @RequestMapping(value = "getMsg")
@@ -188,7 +192,9 @@ public class TbBusinessController {
     public AjaxJson getOtherBusiness() {
         SoMap so = SoMap.getRequestSoMap();
         String currentCustomerId = StpUserUtil.getCustomerId();
-        if (!currentCustomerId.equals(UserTypeEnum.PLATFORM_ADMIN.getCustomerId())) {
+        TbCostomer currentCustomer = tbCostomerService.getById(currentCustomerId);
+        if (!currentCustomerId.equals(UserTypeEnum.PLATFORM_ADMIN.getCustomerId())
+                && currentCustomer.getType().equals(TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
             so.put("createByCustomerId", currentCustomerId);
         }
         List<TbBusiness> list = tbBusinessService.getList(so.startPage());