Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

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

@@ -12,6 +12,9 @@ import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
 
 /**
  * @author: zj
@@ -58,4 +61,13 @@ public class CompanyController extends BaseController{
     public ResultBody<CompanyInfoVO> listCompanyPage(@RequestBody CompanyInfoQO companyInfoQO){
         return companyService.listCompanyPage(companyInfoQO);
     }
+
+    @ApiIgnore
+    @ApiOperation(value = "单位列表-后台使用")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = CompanyInfoVO.class) })
+    @PostMapping("listCompanyPageBack")
+    public List<CompanyInfoVO> listCompanyPageBack(@RequestBody CompanyInfoQO companyInfoQO){
+        return companyService.listCompanyPageBack(companyInfoQO);
+    }
+    
 }

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

@@ -5,6 +5,8 @@ import com.mmc.iuav.user.entity.CompanyBackUserDO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 
+import java.util.List;
+
 /**
  * @author: zj
  * @Date: 2023/7/3 15:39
@@ -64,4 +66,6 @@ public interface CompanyService {
      * @param companyBackUserDO
      */
     void updateCompanyBackUser(CompanyBackUserDO companyBackUserDO);
+
+    List<CompanyInfoVO> listCompanyPageBack(CompanyInfoQO companyInfoQO);
 }

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

@@ -99,4 +99,12 @@ public class CompanyServiceImpl implements CompanyService {
     public void updateCompanyBackUser(CompanyBackUserDO companyBackUserDO) {
         companyDao.updateCompanyBackUser(companyBackUserDO);
     }
+    @Override
+    public List<CompanyInfoVO> listCompanyPageBack(CompanyInfoQO param) {
+        Integer pageNo = param.getPageNo();
+        param.buildCurrentPage();
+        List<CompanyInfoDO> companyInfoDOS = companyDao.listCompanyPage(param);
+        List<CompanyInfoVO> companyInfoVOList = companyInfoDOS.stream().map(CompanyInfoDO::buildCompanyInfoVO).collect(Collectors.toList());
+        return companyInfoVOList;
+    }
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 78b031331a6b73f0c320a339a43ba7b8cb3958fe
+  newTag: ef715ba058a724500019a3969a0bc307c6c9bb80