Merge pull request #75 from zhangbin1010/dev

[Upgrade] 调整默认角色编码
zhangbinhub · Aug 17, 2019 · 380486b · 380486b
2 parents 73d53a3 + 1b355ae
commit 380486b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/cloud/acp-admin-cloud-constant/src/main/kotlin/pers/acp/admin/constant/RoleCode.kt b/cloud/acp-admin-cloud-constant/src/main/kotlin/pers/acp/admin/constant/RoleCode.kt
@@ -13,7 +13,7 @@ object RoleCode {
     /**
      * 新建角色时默认值
      */
-    const val OTHER = "OTHER"
+    const val BUSINESS = "BUSINESS"
 
     /**
      * 超级管理员

diff --git a/cloud/oauth-server/src/main/kotlin/pers/acp/admin/oauth/controller/api/AuthController.kt b/cloud/oauth-server/src/main/kotlin/pers/acp/admin/oauth/controller/api/AuthController.kt
@@ -61,6 +61,7 @@ constructor(private val logAdapter: LogAdapter, private val menuDomain: MenuDoma
                     moduleFuncCodeList.add(value)
                 }
             }
+            moduleFuncCodeList.sort()
         } catch (e: Exception) {
             logAdapter.error(e.message, e)
         }

diff --git a/cloud/oauth-server/src/main/kotlin/pers/acp/admin/oauth/controller/api/RoleController.kt b/cloud/oauth-server/src/main/kotlin/pers/acp/admin/oauth/controller/api/RoleController.kt
@@ -60,6 +60,7 @@ constructor(private val logAdapter: LogAdapter, private val roleDomain: RoleDoma
                     }
                 }
             }
+            roleCodeList.sort()
         } catch (e: Exception) {
             logAdapter.error(e.message, e)
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
                 }
+                roleCodeList.sort()
             } catch (e: Exception) {
                 logAdapter.error(e.message, e)
             }
@@ Expand Down @@