Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-05-08 6924e965ea3da70823f50f7285b50efab7205415

 zq-erp/src/main/java/com/matrix/system/hive/action/ShopInfoController.java

@@ -7,6 +7,7 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysShopInfo;
@@ -108,6 +109,16 @@
      QueryUtil.setQueryLimitCom(shopInfo);
      return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findByModel(shopInfo), null);
   }

   @RequestMapping(value = "/findAllWithPermi" )
   public @ResponseBody AjaxResult findAllWithPermi(SysShopInfo shopInfo) {
      QueryUtil.setQueryLimitCom(shopInfo);
      SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
      if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
         shopInfo.setId(sysUsers.getShopId());
      }
      return new AjaxResult(AjaxResult.STATUS_SUCCESS, currentService.findByModel(shopInfo), null);
   }
   /**
    * 查询非总店 商城店铺的门店
    * TODO 微商城不应该调用这里的接口