Commit 02c3f3d8 authored by fangxinjiang's avatar fangxinjiang

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

parents d8b472f4 efcf3a41
...@@ -127,10 +127,18 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa ...@@ -127,10 +127,18 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
sysDataAuth.setCreateBy(user.getId()); sysDataAuth.setCreateBy(user.getId());
sysDataAuth.setCreateName(user.getNickname()); sysDataAuth.setCreateName(user.getNickname());
sysDataAuth.setCreateTime(LocalDateTime.now()); sysDataAuth.setCreateTime(LocalDateTime.now());
if (Common.isEmpty(sysDataAuth.getIsCreateAuth())) {
sysDataAuth.setIsCreateAuth(0); sysDataAuth.setIsCreateAuth(0);
}
if (Common.isEmpty(sysDataAuth.getIsDeptAuth())) {
sysDataAuth.setIsDeptAuth(0); sysDataAuth.setIsDeptAuth(0);
}
if (Common.isEmpty(sysDataAuth.getIsSettleAuth())) {
sysDataAuth.setIsSettleAuth(0); sysDataAuth.setIsSettleAuth(0);
}
if (Common.isEmpty(sysDataAuth.getIsDiySql())) {
sysDataAuth.setIsDiySql(0); sysDataAuth.setIsDiySql(0);
}
this.save(sysDataAuth); this.save(sysDataAuth);
mainId = sysDataAuth.getId(); mainId = sysDataAuth.getId();
} else { } else {
...@@ -200,7 +208,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa ...@@ -200,7 +208,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
menu.setSysDataAuthId(mainId); menu.setSysDataAuthId(mainId);
menu.setType(3); menu.setType(3);
} }
saveMenuDeptList.addAll(menuSettleList); saveMenuDeptList.addAll(menuDeptList);
} }
String nowSql; String nowSql;
// 处理创建人 // 处理创建人
...@@ -218,7 +226,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa ...@@ -218,7 +226,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
menu.setType(1); menu.setType(1);
menu.setSysDataAuthId(mainId); menu.setSysDataAuthId(mainId);
} }
saveMenuDeptList.addAll(menuSettleList); saveMenuDeptList.addAll(menuCreateList);
} }
// 处理结算主体 // 处理结算主体
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment