|
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -72,6 +73,8 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
|
|
|
|
|
|
//3-新增or修改
|
|
|
if (req.getId() != null) {
|
|
|
+ qrBoxCodeFormat.setUpdateTime(LocalDateTime.now());
|
|
|
+ qrBoxCodeFormat.setUpdateBy(userUtil.getUser().getUserName());
|
|
|
qrBoxCodeFormatMapper.updateById(qrBoxCodeFormat);
|
|
|
} else {
|
|
|
qrBoxCodeFormatMapper.insert(qrBoxCodeFormat);
|
|
@@ -115,7 +118,7 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
|
|
|
@Override
|
|
|
public ListBoxCodeFormatRes listBoxCodeFormat(ListBoxCodeFormatReq req) {
|
|
|
//数据权限隔离,如果登录账号是包材厂,只能看账号包材厂的数据。否则看全部
|
|
|
- if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType()) ) {
|
|
|
+ if (userUtil.getWholeUser().getFactoryId() != null && userUtil.getWholeUser().getFactoryType() != null && FactoryTypeEnum.COVER.is(userUtil.getWholeUser().getFactoryType())) {
|
|
|
req.setFactoryId(userUtil.getWholeUser().getFactoryId());
|
|
|
}
|
|
|
//分页查询
|