LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

name to real name

Browse Source
This commit is contained in:
MaxKey
2022-07-04 09:12:58 +08:00
parent 8bfdaa33c0
commit 451af2dbac
82 changed files with 1376 additions and 1459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RolesController.java
View File

@@ -26,6 +26,7 @@ import org.maxkey.entity.Roles;
import org.maxkey.entity.Message;
import org.maxkey.entity.UserInfo;
import org.maxkey.persistence.service.RolesService;
import org.maxkey.util.StringUtils;
import org.maxkey.persistence.service.HistorySystemLogsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,6 +88,10 @@ public class RolesController {
public ResponseEntity<?> insert(@RequestBody Roles role,@CurrentUser UserInfo currentUser) {
_logger.debug("-Add :" + role);
role.setInstId(currentUser.getInstId());
role.setId(role.generateId());
if(StringUtils.isBlank(role.getRoleCode())) {
role.setRoleCode(role.getId());
}
if (rolesService.insert(role)) {
rolesService.refreshDynamicRoles(role);
systemLog.insert(

6
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java
View File

@@ -160,8 +160,8 @@ public class OrganizationsController {
TreeAttributes treeAttributes = new TreeAttributes();
int nodeCount = 0;
for (Organizations org : orgList) {
TreeNode treeNode = new TreeNode(org.getId(),org.getName());
treeNode.setCode(org.getCode());
TreeNode treeNode = new TreeNode(org.getId(),org.getOrgName());
treeNode.setCode(org.getOrgCode());
treeNode.setCodePath(org.getCodePath());
treeNode.setNamePath(org.getNamePath());
treeNode.setParentKey(org.getParentId());
@@ -235,7 +235,7 @@ public class OrganizationsController {
// 组织编码
organization.setId(ExcelUtils.getValue(row, 2));
// 组织名称
organization.setName(ExcelUtils.getValue(row, 3));
organization.setOrgName(ExcelUtils.getValue(row, 3));
// 组织全称
organization.setFullName(ExcelUtils.getValue(row, 4));
// 编码路径

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/permissions/contorller/ResourcesController.java
View File

@@ -148,7 +148,7 @@ public class ResourcesController {
TreeAttributes treeAttributes = new TreeAttributes();
int nodeCount = 0;
for (Resources r : resourceList) {
TreeNode treeNode = new TreeNode(r.getId(),r.getName());
TreeNode treeNode = new TreeNode(r.getId(),r.getResourceName());
treeNode.setParentKey(r.getParentId());
treeNode.setParentTitle(r.getParentName());
treeNode.setAttrs(r);