no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/PayOrderController.java

@@ -175,7 +175,7 @@ public class PayOrderController {
             @ApiParam(required = true, value = "BRAND 品牌 ASSIST_UNIT辅材单位") @RequestParam(required = true) String dictType
 
     ) throws Exception {
-        List<SysDictCompany> sysDictCompanyList = payOrderLogic.sysDict(dictType);
+        List<SysDictCompany> sysDictCompanyList = payOrderLogic.sysDict(dictType, status);
         return ResponseHelper.success(sysDictCompanyList);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/ChangeOrderController.java

@@ -86,10 +86,10 @@ public class ChangeOrderController {
     @PostMapping("/sysDict")
     @ApiOperation(value = "获得字典值")
     public ResponseHelper<List<SysDictCompany>> sysDict(
-            @ApiParam(required = true, value = "BUG_IMG 故障图片 GATHER_IMG采集图片") @RequestParam(required = true) String dictType
-
+            @ApiParam(required = true, value = "BUG_IMG 故障图片 GATHER_IMG采集图片") @RequestParam(required = true) String dictType,
+            @ApiParam(required = true, value = "字典状态(有效无效) ON/OFF") @RequestParam(required = false) String status
     ) throws Exception {
-        List<SysDictCompany> sysDictCompanyList = payOrderLogic.sysDict(dictType);
+        List<SysDictCompany> sysDictCompanyList = payOrderLogic.sysDict(dictType, status);
         return ResponseHelper.success(sysDictCompanyList);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -1116,10 +1116,13 @@ public class PayOrderLogic {
                 .set(WorkerOrder::getPayStatus,"CANCEL").update();
     }
 
-    public List<SysDictCompany> sysDict(String dictType) {
+    public List<SysDictCompany> sysDict(String dictType, String status) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        return sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictType,dictType)
-                .eq(SysDictCompany::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId()).list();
+        return sysDictCompanyService.lambdaQuery()
+                .eq(SysDictCompany::getDictType,dictType)
+                .eq(StringUtils.isNotBlank(status), SysDictCompany::getStatus, status)
+                .eq(SysDictCompany::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
+                .list();
     }
 
     public List<GoodsCategory> getCategoryList() {

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.common.RegionBean;
-import com.gree.mall.manager.bean.es.OrderBaseEs;
 import com.gree.mall.manager.bean.listvo.param.WorkOrderZfireParam;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBase2VO;
 import com.gree.mall.manager.bean.listvo.workorder.OrderBaseAppraiseVO;
@@ -41,7 +40,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -191,7 +189,7 @@ public class OrderBaseLogic {
      */
     public IPage<OrderBaseAppraiseVO> orderBaseAppraiseList(ZfireParamBean zfireParamBean) {
         FieldUtils.supplyParam(zfireParamBean, OrderBaseAppraiseVO.class, commonLogic.getAdminUser());
-        zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
+//        zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
         IPage<OrderBaseAppraiseVO> page = commonMapper.orderBaseAppraiseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
         return page;
     }