fix: 修复询盘跟踪人问题

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/admin/AdminEnquiryController.java

@@ -1,6 +1,7 @@
 package com.slodon.b2b2c.controller.member.admin;
 
 import com.slodon.b2b2c.core.constant.AdminConst;
+import com.slodon.b2b2c.core.constant.VendorConst;
 import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.PageVO;
@@ -20,17 +21,22 @@ import com.slodon.b2b2c.model.seller.StoreModel;
 import com.slodon.b2b2c.model.seller.StoreNameModel;
 import com.slodon.b2b2c.model.seller.VendorModel;
 import com.slodon.b2b2c.model.system.AdminModel;
+import com.slodon.b2b2c.model.system.SystemResourceModel;
 import com.slodon.b2b2c.seller.example.StoreExample;
 import com.slodon.b2b2c.seller.example.StoreNameExample;
+import com.slodon.b2b2c.seller.example.VendorExample;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.seller.pojo.StoreName;
 import com.slodon.b2b2c.seller.pojo.Vendor;
 import com.slodon.b2b2c.system.example.AdminExample;
+import com.slodon.b2b2c.system.example.SystemResourceExample;
 import com.slodon.b2b2c.system.pojo.Admin;
+import com.slodon.b2b2c.system.pojo.SystemResource;
 import com.slodon.b2b2c.vo.business.OrderEnquiryTrackVO;
 import com.slodon.b2b2c.vo.member.EnquiryVendorVO;
 import com.slodon.b2b2c.vo.member.OrderEnquiryVO;
 import com.slodon.b2b2c.vo.seller.StoreVO;
+import com.slodon.b2b2c.vo.system.SystemRoleVO;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -75,6 +81,9 @@ public class AdminEnquiryController extends BaseController {
     @Resource
     private StoreNameModel storeNameModel;
 
+    @Resource
+    private SystemResourceModel systemResourceModel;
+
     /**
      * 询盘管理列表
      *
@@ -115,14 +124,35 @@ public class AdminEnquiryController extends BaseController {
      * @return
      */
     @GetMapping("sub/list")
-    public JsonResult<PageVO<EnquiryVendorVO>> getSubAdminList(HttpServletRequest request) {
-        AdminExample adminExample = new AdminExample();
-        adminExample.setState(AdminConst.ADMIN_STATE_NORM);
-        List<Admin> adminList = adminModel.getAdminList(adminExample, null);
+    public JsonResult<PageVO<EnquiryVendorVO>> getSubAdminList(HttpServletRequest request, Long storeId) {
         ArrayList<EnquiryVendorVO> vos = new ArrayList<>();
-        adminList.forEach(admin -> {
-            vos.add(new EnquiryVendorVO(admin));
-        });
+        if (storeId != null && storeId == 0) {
+            AdminExample adminExample = new AdminExample();
+            adminExample.setState(AdminConst.ADMIN_STATE_NORM);
+            List<Admin> adminList = adminModel.getAdminList(adminExample, null);
+            adminList.forEach(admin -> {
+                //查询角色资源对应表,获取该角色拥有的资源列表
+                SystemResourceExample resourceExample = new SystemResourceExample();
+                resourceExample.setRoleId(admin.getRoleId());
+                resourceExample.setGrade(AdminConst.RESOURCE_GRADE_3);
+                resourceExample.setContent("询盘管理");
+                resourceExample.setOrderBy("resource_id asc");
+                List<SystemResource> resourceRoleList = systemResourceModel.getSystemResourceList(resourceExample, null);
+                if (!CollectionUtils.isEmpty(resourceRoleList)) {
+                    vos.add(new EnquiryVendorVO(admin));
+                }
+            });
+        } else {
+            VendorExample vendorExample = new VendorExample();
+            vendorExample.setStoreId(storeId);
+            vendorExample.setIsStoreAdmin(VendorConst.IS_STORE_ADMIN_1);
+            vendorExample.setIsAllowLogin(VendorConst.IS_ALLOW_LOGIN);
+            List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
+            vendorList.forEach(vendor -> {
+                EnquiryVendorVO vo = new EnquiryVendorVO(vendor);
+                vos.add(vo);
+            });
+        }
         return SldResponse.success(new PageVO<>(vos, null));
     }
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/business/OrderEnquiryVO.java

@@ -75,6 +75,8 @@ public class OrderEnquiryVO implements Serializable {
 
     private String storeName;
 
+    private Long storeId;
+
     public OrderEnquiryVO(MemberEnquiry memberEnquiry) {
         id = memberEnquiry.getId();
         webSite = memberEnquiry.getWebSite();
@@ -103,6 +105,7 @@ public class OrderEnquiryVO implements Serializable {
         validStatusStr = getEnquiryGarbageStatusText(memberEnquiry.getValidStatus());
         goodsName = memberEnquiry.getGoodsName();
         storeName = memberEnquiry.getStoreName();
+        storeId = memberEnquiry.getStoreId();
     }
 
     /**

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/member/MemberEnquiryReadMapper.xml

@@ -268,8 +268,20 @@
 
     <!--分页查询符合条件的记录(指定字段)-->
     <select id="enquiryAdminListPage" resultMap="resultMap">
-        select t1.*,t2.vendor_id,t3.admin_name as vendor_name,(select store_name from store s where s.store_id = t1.store_id) storeName
-               from enquiry t1 LEFT JOIN enquiry_assign t2 on t1.id = t2.enquiry_id LEFT JOIN sys_admin t3 ON t2.vendor_id = t3.admin_id where t1.`status` != 'DELETE'
+        SELECT
+        t1.*,
+        t2.vendor_id,
+        CASE
+        WHEN t1.store_id = 0 THEN t3.admin_name
+        ELSE t5.vendor_name
+        END AS vendor_name,
+        (SELECT store_name FROM store s WHERE s.store_id = t1.store_id) AS storeName
+        FROM enquiry t1
+        LEFT JOIN enquiry_assign t2 ON t1.id = t2.enquiry_id
+        LEFT JOIN sys_admin t3 ON t2.vendor_id = t3.admin_id
+        LEFT JOIN enquiry_assign t4 ON t1.id = t4.enquiry_id AND t1.store_id != 0
+        LEFT JOIN vendor t5 ON t4.vendor_id = t5.vendor_id AND t1.store_id != 0
+        WHERE t1.status != 'DELETE'
         <if test="nameLike != null">
             AND t1.`name` like concat('%',#{nameLike},'%')
         </if>