新增品牌加供应商搜索

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/PmsBrandController.java

@@ -1,5 +1,6 @@
 package com.hwrj.cloud.admin.controller;
 
+import com.hwrj.cloud.admin.dto.param.PmsBrandWebFrom;
 import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
 import com.hwrj.cloud.admin.dto.PmsBrandParam;
@@ -78,10 +79,8 @@ public class PmsBrandController {
     @ApiOperation(value = "根据品牌名称分页获取品牌列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<CommonPage<PmsBrand>> getList(@RequestParam(value = "keyword", required = false) String keyword,
-                                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                                      @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
-        List<PmsBrand> brandList = brandService.listBrand(keyword, pageNum, pageSize);
+    public CommonResult<CommonPage<PmsBrand>> getList(PmsBrandWebFrom pmsBrandWebFrom) {
+        List<PmsBrand> brandList = brandService.listBrand(pmsBrandWebFrom);
         return CommonResult.success(CommonPage.restPage(brandList));
     }
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsMemberOriginController.java

@@ -93,7 +93,6 @@ public class UmsMemberOriginController {
     })
     @PostMapping("/list")
     public CommonResult list(@RequestBody MemberWebPageParam origin){
-        origin.setCompId(CurrUserUtil.getCompIdInfo());
         List<UmsMemberOriginParam> list = umsMemberOriginService.list(origin);
         return CommonResult.success(CommonPage.restPage(list));
     }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/PageFrom.java

@@ -0,0 +1,9 @@
+package com.hwrj.cloud.admin.dto.param;
+
+import lombok.Data;
+
+@Data
+public class PageFrom {
+    private Integer pageNum;
+    private Integer pageSize;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/PmsBrandWebFrom.java

@@ -0,0 +1,12 @@
+package com.hwrj.cloud.admin.dto.param;
+
+import lombok.Data;
+
+@Data
+public class PmsBrandWebFrom extends PageFrom {
+   private String keyword;
+   /**
+    * 供应商id
+    */
+   private Long compId;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/PmsBrandService.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.service;
 
 import com.hwrj.cloud.admin.dto.PmsBrandParam;
+import com.hwrj.cloud.admin.dto.param.PmsBrandWebFrom;
 import com.hwrj.cloud.admin.model.PmsBrand;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,7 +41,7 @@ public interface PmsBrandService {
     /**
      * 分页查询品牌
      */
-    List<PmsBrand> listBrand(String keyword, int pageNum, int pageSize);
+    List<PmsBrand> listBrand(PmsBrandWebFrom pmsBrandWebFrom);
 
     /**
      * 获取品牌

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsBrandServiceImpl.java

@@ -3,6 +3,7 @@ package com.hwrj.cloud.admin.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.hwrj.cloud.admin.dao.PmsBrandDao;
 import com.hwrj.cloud.admin.dto.PmsBrandParam;
+import com.hwrj.cloud.admin.dto.param.PmsBrandWebFrom;
 import com.hwrj.cloud.admin.mapper.PmsBrandMapper;
 import com.hwrj.cloud.admin.mapper.PmsProductMapper;
 import com.hwrj.cloud.admin.model.PmsBrand;
@@ -97,13 +98,17 @@ public class PmsBrandServiceImpl implements PmsBrandService {
     }
 
     @Override
-    public List<PmsBrand> listBrand(String keyword, int pageNum, int pageSize) {
+    public List<PmsBrand> listBrand(PmsBrandWebFrom pmsBrandWebFrom) {
         Long compId = CurrUserUtil.getCompIdInfo();
 
-        PageHelper.startPage(pageNum, pageSize);
+        if(StringUtils.isEmpty(compId)){
+             compId = pmsBrandWebFrom.getCompId();
+        }
+        PageHelper.startPage(pmsBrandWebFrom.getPageNum(), pmsBrandWebFrom.getPageSize());
         PmsBrandExample pmsBrandExample = new PmsBrandExample();
         pmsBrandExample.setOrderByClause("sort desc");
         PmsBrandExample.Criteria criteria = pmsBrandExample.createCriteria();
+        String keyword = pmsBrandWebFrom.getKeyword();
         if (!StringUtils.isEmpty(keyword)) {
             criteria.andNameLike("%" + keyword + "%");
         }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginServiceImpl.java

@@ -136,6 +136,11 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
 
     @Override
     public List<UmsMemberOriginParam> list(MemberWebPageParam memberWebPageParam) {
+        //判断是不是供应商不是获取全部或者特定的供应商数据
+        Long compId = CurrUserUtil.getCompIdInfo();
+        if(StringUtils.isEmpty(compId)){
+            memberWebPageParam.setCompId(memberWebPageParam.getCompId());
+        }
         PageHelper.startPage(memberWebPageParam.getPageNo(), memberWebPageParam.getPageSize());
         List<UmsMemberOriginParam> list = umsMemberOriginDao.pageList(memberWebPageParam);
         return list;

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginDao.xml

@@ -68,7 +68,7 @@
         select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
         from ums_member_origin
         WHERE state = 0
-        <if test="compId != null">
+        <if test="compId != null and compId != ''">
             AND comp_id = #{compId,jdbcType=BIGINT}
         </if>
         <if test="keyword != null and keyword != ''">