~jiangyouyao/beauty-erp.git

			@@ -4,13 +4,11 @@
			import com.matrix.core.exception.GlobleException;
			import com.matrix.core.pojo.AjaxResult;
			import com.matrix.core.pojo.PaginationVO;
			import com.matrix.core.tools.DateUtil;
			import com.matrix.core.tools.LogUtil;
			import com.matrix.core.tools.StringUtils;
			import com.matrix.core.tools.WebUtil;
			import com.matrix.core.tools.*;
			import com.matrix.core.tools.excl.ExcelSheetPO;
			import com.matrix.core.tools.excl.ExcelUtil;
			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.bean.*;
			import com.matrix.system.hive.dao.MoneyCardUseDao;
			@@ -245,8 +243,8 @@
			public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {

			String fileName = file.getOriginalFilename();
			String dirPath = "E:";
			//PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
			// String dirPath = "E:";
			String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);

			File saveFile = new File(dirPath + "/" + fileName);
			file.transferTo(saveFile);

			@@ -17,7 +17,6 @@
			import com.matrix.system.common.bean.BusParameterSettings;
			import com.matrix.system.common.bean.SysUsers;
			import com.matrix.system.common.dao.BusParameterSettingsDao;
			import com.matrix.system.common.tools.DataAuthUtil;
			import com.matrix.system.common.tools.ServiceUtil;
			import com.matrix.system.constance.Dictionary;
			import com.matrix.system.constance.TableMapping;
			@@ -429,10 +428,11 @@

			@Override
			public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
			SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
			if (!DataAuthUtil.hasAllShopAuth()) {
			vipInfoListDto.setShopId(sysUsers.getShopId());
			}
			//todo 会员查询单独做控制
			// SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
			// if (!DataAuthUtil.hasAllShopAuth()) {
			// vipInfoListDto.setShopId(sysUsers.getShopId());
			// }
			QueryUtil.setQueryLimitCom(vipInfoListDto);
			return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
			}

	zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java	10 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java	10 ●●●●● patch \| view \| raw \| blame \| history