Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
YX_IDENT_REFACTORING
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangyusheng
YX_IDENT_REFACTORING
Commits
e9c481a0
Commit
e9c481a0
authored
Nov 22, 2018
by
liboyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
070443a7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
6 deletions
+10
-6
AdminApi.java
src/main/java/com/yxproject/start/api/AdminApi.java
+2
-2
SysPermissionMapper.java
.../java/com/yxproject/start/mapper/SysPermissionMapper.java
+1
-1
updatePerms.html
src/main/resources/static/dialogs/updatePerms.html
+4
-0
permissionList.html
...rces/static/tpl/layout/permissionList/permissionList.html
+2
-2
permissionList.js
...ources/static/tpl/layout/permissionList/permissionList.js
+1
-1
No files found.
src/main/java/com/yxproject/start/api/AdminApi.java
View file @
e9c481a0
...
@@ -239,7 +239,7 @@ public class AdminApi {
...
@@ -239,7 +239,7 @@ public class AdminApi {
SysPermission
sysPermission
=
new
SysPermission
();
SysPermission
sysPermission
=
new
SysPermission
();
sysPermission
.
setName
(
jsonObject
.
getString
(
"name"
));
sysPermission
.
setName
(
jsonObject
.
getString
(
"name"
));
sysPermission
.
setResource_type
(
jsonObject
.
getString
(
"resourceType"
));
sysPermission
.
setResource_type
(
jsonObject
.
getString
(
"resourceType"
));
//
sysPermission.setUrl(jsonObject.getString("url"));
sysPermission
.
setUrl
(
jsonObject
.
getString
(
"url"
));
sysPermission
.
setPermission
(
jsonObject
.
getString
(
"permission"
));
sysPermission
.
setPermission
(
jsonObject
.
getString
(
"permission"
));
// sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId")));
// sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId")));
// if(jsonObject.getString("parentId").equals(str)){
// if(jsonObject.getString("parentId").equals(str)){
...
@@ -401,7 +401,7 @@ public class AdminApi {
...
@@ -401,7 +401,7 @@ public class AdminApi {
sysPermission
.
setId
(
Integer
.
parseInt
(
jsonObject
.
getString
(
"id"
)));
sysPermission
.
setId
(
Integer
.
parseInt
(
jsonObject
.
getString
(
"id"
)));
sysPermission
.
setName
(
jsonObject
.
getString
(
"name"
));
sysPermission
.
setName
(
jsonObject
.
getString
(
"name"
));
sysPermission
.
setResource_type
(
jsonObject
.
getString
(
"resourceType"
));
sysPermission
.
setResource_type
(
jsonObject
.
getString
(
"resourceType"
));
//
sysPermission.setUrl(jsonObject.getString("url"));
sysPermission
.
setUrl
(
jsonObject
.
getString
(
"url"
));
sysPermission
.
setPermission
(
jsonObject
.
getString
(
"permission"
));
sysPermission
.
setPermission
(
jsonObject
.
getString
(
"permission"
));
// sysPermission.setParent_id(Long.parseLong(parentId));
// sysPermission.setParent_id(Long.parseLong(parentId));
// if(parentId.equals(str)){
// if(parentId.equals(str)){
...
...
src/main/java/com/yxproject/start/mapper/SysPermissionMapper.java
View file @
e9c481a0
...
@@ -17,7 +17,7 @@ public interface SysPermissionMapper{
...
@@ -17,7 +17,7 @@ public interface SysPermissionMapper{
* @param sysPermission
* @param sysPermission
*/
*/
@Insert
(
"INSERT INTO sys_permission (id,available,name,parent_id,parent_ids,permission,resource_type,url)\n"
+
@Insert
(
"INSERT INTO sys_permission (id,available,name,parent_id,parent_ids,permission,resource_type,url)\n"
+
"VALUES (PERMISSION_seq.nextval,0,#{name},'0','0/',#{permission},#{resource_type},
''
)"
)
"VALUES (PERMISSION_seq.nextval,0,#{name},'0','0/',#{permission},#{resource_type},
#{url}
)"
)
public
void
addPermissionByMap
(
SysPermission
sysPermission
);
public
void
addPermissionByMap
(
SysPermission
sysPermission
);
/**
/**
...
...
src/main/resources/static/dialogs/updatePerms.html
View file @
e9c481a0
...
@@ -8,6 +8,10 @@
...
@@ -8,6 +8,10 @@
<label>
名称
</label>
<label>
名称
</label>
<input
type=
"text"
class=
"form-control"
ng-model=
"thisPerm.name"
ng-value=
"thisPerm.name"
required
>
<input
type=
"text"
class=
"form-control"
ng-model=
"thisPerm.name"
ng-value=
"thisPerm.name"
required
>
</div>
</div>
<div
class=
"form-group"
>
<label>
路径
</label>
<input
type=
"text"
class=
"form-control"
ng-model=
"thisPerm.url"
ng-value=
"thisPerm.url"
required
>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label>
权限字符串
</label>
<label>
权限字符串
</label>
<input
type=
"text"
class=
"form-control"
ng-model=
"thisPerm.permission"
ng-value=
"thisPerm.permission"
required
>
<input
type=
"text"
class=
"form-control"
ng-model=
"thisPerm.permission"
ng-value=
"thisPerm.permission"
required
>
...
...
src/main/resources/static/tpl/layout/permissionList/permissionList.html
View file @
e9c481a0
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
<th>
ID
</th>
<th>
ID
</th>
<th>
权限
</th>
<th>
权限
</th>
<th>
名称
</th>
<th>
名称
</th>
<
!--<th>路径</th>--
>
<
th>
路径
</th
>
<th>
类型
</th>
<th>
类型
</th>
<!--<th>父类id</th>-->
<!--<th>父类id</th>-->
<!--<th>父类id树</th>-->
<!--<th>父类id树</th>-->
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
<td>
{{permission.id}}
</td>
<td>
{{permission.id}}
</td>
<td>
{{permission.permission}}
</td>
<td>
{{permission.permission}}
</td>
<td>
{{permission.name}}
</td>
<td>
{{permission.name}}
</td>
<
!--<td>{{permission.url}}</td>--
>
<
td>
{{permission.url}}
</td
>
<td>
{{permission.resource_type}}
</td>
<td>
{{permission.resource_type}}
</td>
<!--<td>{{permission.parent_id}}</td>-->
<!--<td>{{permission.parent_id}}</td>-->
<!--<td>{{permission.parent_ids}}</td>-->
<!--<td>{{permission.parent_ids}}</td>-->
...
...
src/main/resources/static/tpl/layout/permissionList/permissionList.js
View file @
e9c481a0
...
@@ -69,7 +69,7 @@ app.controller('permissionListCtrl', ['$scope','$rootScope', '$http', '$state',
...
@@ -69,7 +69,7 @@ app.controller('permissionListCtrl', ['$scope','$rootScope', '$http', '$state',
var
jsonPerm
=
{};
var
jsonPerm
=
{};
jsonPerm
.
id
=
$scope
.
thisPerm
.
id
;
jsonPerm
.
id
=
$scope
.
thisPerm
.
id
;
jsonPerm
.
name
=
$scope
.
thisPerm
.
name
;
jsonPerm
.
name
=
$scope
.
thisPerm
.
name
;
//
jsonPerm.url=$scope.thisPerm.url;
jsonPerm
.
url
=
$scope
.
thisPerm
.
url
;
jsonPerm
.
permission
=
$scope
.
thisPerm
.
permission
;
jsonPerm
.
permission
=
$scope
.
thisPerm
.
permission
;
jsonPerm
.
resourceType
=
resourceType
;
jsonPerm
.
resourceType
=
resourceType
;
console
.
log
(
jsonPerm
)
console
.
log
(
jsonPerm
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment