列表页bug修复

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/LicenceOrderPageQDTO.java

@@ -70,6 +70,18 @@ public class LicenceOrderPageQDTO extends BasePageInfo implements Serializable
      * 微信订单id
      */
     private String wxOrderId;
+    /**
+     * 1 好办后台 0 运维后台
+     */
+    private Integer type;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 
     public String getWxOrderId() {
         return wxOrderId;

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/LicenceOrderController.java

@@ -70,6 +70,7 @@ public class LicenceOrderController {
     @RequestMapping("licence-order-page")
     public RestResponse<Page<LicenceOrderPageVO>> getLicenceOrderPage(@RequestBody LicenceOrderPageQO licenceOrderPageQO) {
         LicenceOrderPageQDTO qdto = JSONObject.parseObject(JSONObject.toJSONString(licenceOrderPageQO), LicenceOrderPageQDTO.class);
+        qdto.setType(0);
         ServiceResponse<Page<LicenceOrderPageDTO>> licenceOrderPage = licenceOrderApiService.getLicenceOrderPage(qdto);
         Page<LicenceOrderPageVO> result = PageHelperUtils.changePageToCurrentPage(licenceOrderPage.getResult(), LicenceOrderPageVO.class);
         if (CollUtil.isNotEmpty(result.getResult())) {

haoban-manage3-service/src/main/resources/mapper/licence/TabHaobanLicenceOrderMapper.xml

@@ -240,6 +240,9 @@
         <if test="wxOrderId != null and wxOrderId !='' ">
             and wx_order_id=#{wxOrderId}
         </if>
+        <if test="type != null and type ==1 ">
+            and wx_enterprise_id = #{wxEnterpriseId}
+        </if>
         order by create_time desc
     </select>
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/LicenceOrderController.java

@@ -148,6 +148,7 @@ public class LicenceOrderController {
         qdto.setEnterpriseId(enterpriseId);
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setCreatorName(clerkName);
+        qdto.setType(1);
         ServiceResponse<Page<LicenceOrderPageDTO>> licenceOrderPage = licenceOrderApiService.getLicenceOrderPage(qdto);
         Page<LicenceOrderPageVO> result = PageHelperUtils.changePageToCurrentPage(licenceOrderPage.getResult(), LicenceOrderPageVO.class);
         return RestResponse.successResult(result);