From 811502f3fcc7a1d4f1bbac6d31f4a662c85e6078 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 17 Mar 2023 21:04:47 +0800
Subject: [PATCH] =?UTF-8?q?c=E7=A6=85=E9=81=93bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basic/UdiRelevanceController.java | 16 +++++++++++-----
 .../mybatis/mapper/basic/BasicBusTypePreDao.xml  |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 83a16c3f..705623fa 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -8,6 +8,7 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
@@ -43,7 +44,7 @@ import java.util.Date;
 import java.util.List;
 
 @RestController
-public class UdiRelevanceController {
+public class UdiRelevanceController extends BaseController {
     @Resource
     GennerOrderUtils gennerOrderUtils;
     @Resource
@@ -160,8 +161,13 @@ public class UdiRelevanceController {
         } else {
             filterUdiRelRequest.setDiType(1);
         }
-        udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
 
+//        if (isHosUser()) {
+//            filterUdiRelRequest.setUnitFk(null);
+//        } else {
+//            filterUdiRelRequest.setUnitFk(getCustomerId());
+//        }
+        udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
         if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
             for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
                 UdiRlSupEntity companyProductRelevanceEntity =
@@ -289,9 +295,9 @@ public class UdiRelevanceController {
         }
 
         //更新关联表
-        if(udiRelevanceSaveRequest.getIsDateBy()!=null && udiRelevanceSaveRequest.getIsDateBy()==1){
-            if(udiRelevanceSaveRequest.getRecentDateTime()!=null){
-                int time=udiRelevanceSaveRequest.getRecentDateTime()*24;
+        if (udiRelevanceSaveRequest.getIsDateBy() != null && udiRelevanceSaveRequest.getIsDateBy() == 1) {
+            if (udiRelevanceSaveRequest.getRecentDateTime() != null) {
+                int time = udiRelevanceSaveRequest.getRecentDateTime() * 24;
                 udiRelevanceSaveRequest.setRecentDateTime(time);
             }
         }
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml
index d6eaedf9..cf8616f8 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml
@@ -34,7 +34,7 @@
                (select name from basic_bussiness_type where action = basic_bustype_pre.originAction) originName,
                (select name
                 from basic_bussiness_type
-                where basic_bussiness_type.originAction = basic_bustype_pre.action)                  targetName,
+                where basic_bussiness_type.action = basic_bustype_pre.action)                  targetName,
                (select basic_bustype_change.originName
                 from basic_bustype_change
                 where basic_bustype_change.originAction = basic_bustype_pre.targetBusAction)         targetBusName