单位列表筛选

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/CompanyInfoQO.java

@@ -20,6 +20,10 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class CompanyInfoQO implements Serializable {
     private static final long serialVersionUID = -6148830939232702460L;
+
+    @ApiModelProperty(value = "单位id", hidden = true)
+    private Integer companyInfoId;
+
     @ApiModelProperty(value = "单位名称", example = "科比特")
     private String companyName;
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CompanyController.java

@@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -58,8 +59,8 @@ public class CompanyController extends BaseController{
     @ApiOperation(value = "单位列表")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = CompanyInfoVO.class) })
     @PostMapping("listCompanyPage")
-    public ResultBody<CompanyInfoVO> listCompanyPage(@RequestBody CompanyInfoQO companyInfoQO){
-        return companyService.listCompanyPage(companyInfoQO);
+    public ResultBody<CompanyInfoVO> listCompanyPage(@RequestBody CompanyInfoQO companyInfoQO, HttpServletRequest request){
+        return companyService.listCompanyPage(companyInfoQO, this.getUserLoginInfoFromRedis(request));
     }
 
     @ApiIgnore

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CompanyService.java

@@ -2,6 +2,7 @@ package com.mmc.iuav.user.service;
 
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.entity.CompanyBackUserDO;
+import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 
@@ -44,9 +45,10 @@ public interface CompanyService {
     /**
      * 单位列表
      * @param companyInfoQO
+     * @param userLoginInfoFromRedis
      * @return
      */
-    ResultBody<CompanyInfoVO> listCompanyPage(CompanyInfoQO companyInfoQO);
+    ResultBody<CompanyInfoVO> listCompanyPage(CompanyInfoQO companyInfoQO, LoginSuccessDTO userLoginInfoFromRedis);
 
     /**
      * 通过用户id获取单位信息

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -7,6 +7,7 @@ import com.mmc.iuav.user.client.PmsClient;
 import com.mmc.iuav.user.dao.CompanyDao;
 import com.mmc.iuav.user.entity.CompanyBackUserDO;
 import com.mmc.iuav.user.entity.CompanyInfoDO;
+import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import com.mmc.iuav.user.service.CompanyService;
@@ -69,7 +70,10 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
-    public ResultBody<CompanyInfoVO> listCompanyPage(CompanyInfoQO param) {
+    public ResultBody<CompanyInfoVO> listCompanyPage(CompanyInfoQO param, LoginSuccessDTO loginSuccessDTO) {
+        if (loginSuccessDTO.getCompanyInfoVO() != null && !loginSuccessDTO.getCompanyInfoVO().getCompanyType().equals(0)){
+            param.setCompanyInfoId(loginSuccessDTO.getCompanyInfoVO().getId());
+        }
         int count = companyDao.countListCompanyPage(param);
         if (count == 0){
             return ResultBody.success(PageResult.buildPage(param.getPageNo(), param.getPageSize(), count));

csm-service/cms-service-user/src/main/resources/mapper/CompanyDao.xml

@@ -69,7 +69,10 @@
         select count(*) from company_info
         where is_deleted = 0
         <if test="companyName != null">
-            and company_name = #{companyName}
+            and company_name like CONCAT("%",#{companyName},"%")
+        </if>
+        <if test="companyInfoId != null">
+            and companyInfoId = #{companyInfoId}
         </if>
     </select>
 
@@ -78,7 +81,10 @@
         from company_info
         where is_deleted = 0
         <if test="companyName != null">
-            and company_name = #{companyName}
+            and company_name like CONCAT("%",#{companyName},"%")
+        </if>
+        <if test="companyInfoId != null">
+            and companyInfoId = #{companyInfoId}
         </if>
         order by create_time desc
         limit #{pageNo}, #{pageSize}