admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
pengjie 2023-08-22 18:02:37 +08:00
parent 452c8d66eb
commit 351f2d131c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -164,6 +164,9 @@ public class DataScopeHandler implements DataPermissionHandler {
protected void addParam(Insert insert, Object obj){ protected void addParam(Insert insert, Object obj){
SecurityUser user = SecurityUtil.getUser(); SecurityUser user = SecurityUtil.getUser();
if (user == null) {
return;
}
List<Column> columns = insert.getColumns(); List<Column> columns = insert.getColumns();
if (CollectionUtils.isEmpty(columns)) { if (CollectionUtils.isEmpty(columns)) {
// 针对不给列名的insert 不处理 // 针对不给列名的insert 不处理

8
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java
View File

@ -163,18 +163,18 @@ public class ProjectSubItemServiceImpl extends ServiceImpl<ProjectSubItemMapper,
for (ProjectSubItem child : children) { for (ProjectSubItem child : children) {
if (child.getState() != 3) { if (child.getState() != 3) {
if (child.getRealEndTime() != null) { if (child.getRealEndTime() != null) {
child.setSlippage(DateUtil.compare(child.getRealEndTime(), child.getPlanEndTime()) <= 0 ? null : DateUtil.between(child.getRealEndTime(), child.getPlanEndTime(), DateUnit.DAY)); child.setSlippage(DateUtil.between(child.getRealEndTime(), child.getPlanEndTime(), DateUnit.DAY) <= 0 ? null : DateUtil.between(child.getRealEndTime(), child.getPlanEndTime(), DateUnit.DAY));
} else { } else {
child.setSlippage(DateUtil.compare(new Date(), child.getPlanEndTime()) <= 0 ? null : DateUtil.between(new Date(), child.getPlanEndTime(), DateUnit.DAY)); child.setSlippage(DateUtil.between(new Date(), child.getPlanEndTime(), DateUnit.DAY) <= 0 ? null : DateUtil.between(new Date(), child.getPlanEndTime(), DateUnit.DAY));
} }
} }
} }
for (ProjectSubItemDto subItem : records) { for (ProjectSubItemDto subItem : records) {
if (subItem.getState() != 3) { if (subItem.getState() != 3) {
if (subItem.getRealEndTime() != null) { if (subItem.getRealEndTime() != null) {
subItem.setSlippage(DateUtil.compare(subItem.getRealEndTime(), subItem.getPlanEndTime()) <= 0 ? null : DateUtil.between(subItem.getRealEndTime(), subItem.getPlanEndTime(), DateUnit.DAY)); subItem.setSlippage(DateUtil.between(subItem.getRealEndTime(), subItem.getPlanEndTime(), DateUnit.DAY) <= 0 ? null : DateUtil.between(subItem.getRealEndTime(), subItem.getPlanEndTime(), DateUnit.DAY));
} else { } else {
subItem.setSlippage(DateUtil.compare(new Date(), subItem.getPlanEndTime()) <= 0 ? null : DateUtil.between(new Date(), subItem.getPlanEndTime(), DateUnit.DAY)); subItem.setSlippage(DateUtil.between(new Date(), subItem.getPlanEndTime(), DateUnit.DAY) <= 0 ? null : DateUtil.between(new Date(), subItem.getPlanEndTime(), DateUnit.DAY));
} }
} }
subItem.setChildren(children.stream().filter(c -> c.getParentId().equals(subItem.getId())).collect(Collectors.toList())); subItem.setChildren(children.stream().filter(c -> c.getParentId().equals(subItem.getId())).collect(Collectors.toList()));