供应商拉取部门问题修改"

src/main/java/com/glxp/api/controller/auth/DeptController.java

@@ -162,6 +162,7 @@ public class DeptController extends BaseController {
         List<DeptEntity> invWarehouseEntities;
         AuthAdmin authAdmin = customerService.getUserBean();
         if (authAdmin.getCustomerId().equals("110")) {
+            filterInvWarehouseRequest.setCustomerId("110");
             filterInvWarehouseRequest.setUserId(authAdmin.getId());
         } else {
             filterInvWarehouseRequest.setUserId(null);

src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java

@@ -31,4 +31,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private String superiorCode;//上级
     private String subordinateCode;//下级
     private String superiorPcode;//上级
+    private String CustomerId;
 }

src/main/resources/mybatis/mapper/auth/DeptDao.xml

@@ -47,7 +47,9 @@
             resultType="com.glxp.api.entity.auth.DeptEntity">
         select auth_dept.* from auth_dept INNER JOIN auth_warehouse
         on auth_dept.`code` =auth_warehouse.parentId
-        INNER JOIN auth_warehouse_user on auth_warehouse_user.`code` = auth_warehouse.code
+        <if test="CustomerId != '' and CustomerId != null">
+            INNER JOIN auth_warehouse_user on auth_warehouse_user.`code` = auth_warehouse.code
+        </if>
         <where>
             <if test="id != '' and id != null">
                 AND id = #{id}