productDev/dmMes.git

			@@ -83,4 +83,9 @@
			@TableField(exist = false)
			private String companyName;

			@ApiModelProperty(value = "企业用户名称")
			@ExcelColumn(name="企业名称", color = IndexedColors.RED, width = 16)
			@TableField(exist = false)
			private String companyUserName;

			}

			@@ -332,7 +332,7 @@
			QueryWrapper<WarehouseLocation> warehouseLocationQuery = new QueryWrapper<>();
			warehouseLocationQuery.lambda()
			.eq(WarehouseLocation::getRootDepartId,department.getRootId())
			.eq(WarehouseLocation::getUnionName
			.in(WarehouseLocation::getUnionName
			,Arrays.asList(s.getFinishWarehouseLocationName(),s.getProduceWarehouseLocationName()));
			if(Objects.equals(list.size(),2)){
			throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"库位信息已存在");
			@@ -361,8 +361,8 @@
			device.setStationCode(s.getStationCode());
			// device.setGroupId();
			// device.setSerialNum();
			device.setProduceWarehouseLocationId(collect.get(s.getProduceWarehouseLocationName()).getId());
			device.setFinishWarehouseLocationId(collect.get(s.getFinishWarehouseLocationName()).getId());
			device.setProduceWarehouseLocationId(Optional.ofNullable(collect.get(s.getProduceWarehouseLocationName())).map(m->m.getId()).orElse(null));
			device.setFinishWarehouseLocationId(Optional.ofNullable(collect.get(s.getFinishWarehouseLocationName())).map(m->m.getId()).orElse(null));
			deviceMapper.insert(device);
			if(StringUtils.isNotBlank(s.getUserIds())){
			this.dealDeviceUserId(Constants.ZERO,device.getUserIds().trim(),device.getId(),user);

			@@ -5,6 +5,7 @@
			import doumeemes.core.model.PageWrap;
			import doumeemes.core.utils.Utils;
			import doumeemes.dao.business.model.Company;
			import doumeemes.dao.business.model.CompanyUser;
			import doumeemes.dao.system.SystemLoginLogMapper;
			import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
			import doumeemes.dao.system.join.SystemLoginLogJoinMapper;
			@@ -88,7 +89,7 @@
			Wrapper<SystemLoginLog> wrapper = new QueryWrapper<>(systemLoginLog);
			return systemLoginLogMapper.selectList(wrapper);
			}


			@Override
			public PageData<SystemLoginLog> findPage(PageWrap<QuerySystemLoginLogDTO> pageWrap) {
			IPage<SystemLoginLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			@@ -96,7 +97,9 @@
			MPJLambdaWrapper<SystemLoginLog> mpjLambdaWrapper = new MPJLambdaWrapper<>();
			mpjLambdaWrapper.selectAll(SystemLoginLog.class);
			mpjLambdaWrapper.leftJoin(Company.class,Company::getId,SystemLoginLog::getCompanyId);
			mpjLambdaWrapper.leftJoin(CompanyUser.class,CompanyUser::getId,SystemLoginLog::getCompanyUserId);
			mpjLambdaWrapper.selectAs(Company::getName, SystemLoginLog::getCompanyName);
			mpjLambdaWrapper.selectAs(CompanyUser::getName, SystemLoginLog::getCompanyUserName);
			// 登录用户名
			if (StringUtils.isNotBlank(pageWrap.getModel().getLoginUsername())) {
			mpjLambdaWrapper.like(SystemLoginLog::getLoginUsername, pageWrap.getModel().getLoginUsername());

	server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/doumeemes/service/system/impl/SystemLoginLogServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史