|
|
@@ -93,7 +93,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
record.setHierarchies("1");//1第一层
|
|
|
record.setStatus("0");//0正常 1解除
|
|
|
record.setShowOrder("0");//0
|
|
|
- record.setSuperId("PM");//顶级为PM
|
|
|
+ record.setSuperId(permissionMapper.selectIdByName("平台超级模块"));//顶级为PM
|
|
|
permissionMapper.insertn(record);
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -115,7 +115,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
record.setCreateTime(now);
|
|
|
record.setUpdateTime(now);
|
|
|
record.setDeletedSign("0");
|
|
|
- String autNo=permissionMapper.selectAutNoByName(record.getSuperId());
|
|
|
+ String autNo=permissionMapper.selectAutNoByNamei(record.getSuperId());
|
|
|
int Count=permissionMapper.selectAutNoCount(record.getSuperId());
|
|
|
if(Count<10){
|
|
|
String aut=autNo+"0"+Count;
|
|
|
@@ -144,7 +144,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
record.setHierarchies("0");//0下层
|
|
|
record.setStatus("0");//0正常 1解除
|
|
|
record.setShowOrder("0");//正常
|
|
|
- record.setSuperId(record.getSuperId());//上级名称
|
|
|
+ record.setSuperId(permissionMapper.selectIdByName(record.getSuperId()));//上级名称
|
|
|
permissionMapper.insertn(record);
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -157,7 +157,8 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
|
|
|
@Override
|
|
|
public Permission selectAllById(String id) {
|
|
|
-
|
|
|
+ Permission permission=permissionMapper.selectAllById(id);
|
|
|
+ permission.setSuperId(permissionMapper.selectNameById(permission.getSuperId()));
|
|
|
return permissionMapper.selectAllById(id);
|
|
|
}
|
|
|
|
|
|
@@ -170,6 +171,12 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
public int updateById(Permission record) {
|
|
|
Date now=new Date();
|
|
|
record.setUpdateTime(now);
|
|
|
+ if(record.getSuperId().equals("平台超级模块")){
|
|
|
+ record.setHierarchies("1");
|
|
|
+ }else{
|
|
|
+ record.setHierarchies("0");
|
|
|
+ }
|
|
|
+ record.setSuperId(permissionMapper.selectIdByName(record.getSuperId()));
|
|
|
String autNo=permissionMapper.selectAutNoByName(record.getSuperId());
|
|
|
int Count=permissionMapper.selectAutNoCount(record.getSuperId());
|
|
|
if(Count<10){
|
|
|
@@ -196,12 +203,6 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
}
|
|
|
record.setAutNo(aut);
|
|
|
}
|
|
|
- if(record.getSuperId().equals("平台超级模块")){
|
|
|
- record.setHierarchies("1");
|
|
|
- }else{
|
|
|
- record.setHierarchies("0");
|
|
|
- }
|
|
|
- System.out.println("name修改:"+record.getName());
|
|
|
permissionMapper.updateById(record);
|
|
|
//*******下级编号修改
|
|
|
int n=0;
|
|
|
@@ -279,17 +280,14 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
Map<String,Object> params = new HashMap<String, Object>();
|
|
|
List<PermissionBo> one=permissionMapper.selectOneAll();
|
|
|
for (PermissionBo i:one){
|
|
|
- String name=permissionMapper.selectNameById(i.getId());
|
|
|
i.setKey(i.getId());
|
|
|
- List<PermissionBo> two=permissionMapper.selectAllBySuperId(name);
|
|
|
+ List<PermissionBo> two=permissionMapper.selectAllBySuperId(i.getId());
|
|
|
for(PermissionBo o:two){
|
|
|
- String name2=permissionMapper.selectNameById(o.getId());
|
|
|
- o.setChildren(permissionMapper.selectAllBySuperId(name2));
|
|
|
+ o.setChildren(permissionMapper.selectAllBySuperId(o.getId()));
|
|
|
o.setKey(o.getId());
|
|
|
- List<PermissionBo> three=permissionMapper.selectAllBySuperId(name2);
|
|
|
+ List<PermissionBo> three=permissionMapper.selectAllBySuperId(o.getId());
|
|
|
for(PermissionBo p:three){
|
|
|
- String name3=permissionMapper.selectNameById(p.getId());
|
|
|
- p.setChildren(permissionMapper.selectAllBySuperId(name3));
|
|
|
+ p.setChildren(permissionMapper.selectAllBySuperId(p.getId()));
|
|
|
p.setKey(p.getId());
|
|
|
}
|
|
|
o.setChildren(three);
|