|
|
@@ -61,8 +61,8 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.getError().add(buildError("","名称、路径、上级不能为空"));
|
|
|
return res;
|
|
|
}
|
|
|
- String aut=permissionMapper.selectAutNoByNamei(record.getName());
|
|
|
- if(aut!=null){
|
|
|
+ String auts=permissionMapper.selectAutNoByNamei(record.getName());
|
|
|
+ if(auts!=null){
|
|
|
res.getError().add(buildError("","权限已存在"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -71,6 +71,38 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.getError().add(buildError("","权限层级超限"));
|
|
|
return res;
|
|
|
}
|
|
|
+ //*********权限编号判断**************
|
|
|
+ record.setSuperId(permissionMapper.selectIdByName(record.getSuperId()));
|
|
|
+ String autNo=permissionMapper.selectAutNoByName(record.getSuperId());
|
|
|
+ int Count=permissionMapper.selectAutNoCount(record.getSuperId());
|
|
|
+ if((Count+1)>99){
|
|
|
+ res.getError().add(buildError("","每层最多存在99个子类"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if(Count<10){
|
|
|
+ String aut=autNo+"0"+Count;
|
|
|
+ String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ while(sid!=null){
|
|
|
+ Count=(Count+1)%100;
|
|
|
+ if(Count>=10){
|
|
|
+ aut=autNo+Count;
|
|
|
+ }else{
|
|
|
+ aut=autNo+"0"+Count;
|
|
|
+ }
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ }
|
|
|
+ record.setAutNo(aut);
|
|
|
+ }
|
|
|
+ if(Count>=10){
|
|
|
+ String aut=autNo+Count;
|
|
|
+ String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ while(sid!=null){
|
|
|
+ Count=(Count+1)%100;
|
|
|
+ aut=autNo+Count;
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ }
|
|
|
+ record.setAutNo(aut);
|
|
|
+ }
|
|
|
res.setData(permissionService.insertSubordinate(record));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -83,8 +115,6 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "id"));
|
|
|
return res;
|
|
|
}
|
|
|
- /*Permission permission=permissionMapper.selectAllById(id);
|
|
|
- String superId=permission.getSuperId();*/
|
|
|
int subordinate=permissionMapper.selectCountBySuperId(id);
|
|
|
if(subordinate>0){
|
|
|
res.getError().add(buildError("","存在下级权限不能删除"));
|
|
|
@@ -143,7 +173,38 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+ //*********权限编号判断**************
|
|
|
+ record.setSuperId(permissionMapper.selectIdByName(record.getSuperId()));//上级名称
|
|
|
+ String autNo=permissionMapper.selectAutNoByName(record.getSuperId());
|
|
|
+ int Count=permissionMapper.selectAutNoCount(record.getSuperId());
|
|
|
+ if((Count+1)>99){
|
|
|
+ res.getError().add(buildError("","每层最多存在99个子类"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if(Count<10){
|
|
|
+ String aut=autNo+"0"+Count;
|
|
|
+ String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ while(sid!=null){
|
|
|
+ Count=(Count+1)%100;
|
|
|
+ if(Count>=10){
|
|
|
+ aut=autNo+Count;
|
|
|
+ }else{
|
|
|
+ aut=autNo+"0"+Count;
|
|
|
+ }
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ }
|
|
|
+ record.setAutNo(aut);
|
|
|
+ }
|
|
|
+ if(Count>=10){
|
|
|
+ String aut=autNo+Count;
|
|
|
+ String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ while(sid!=null){
|
|
|
+ Count=(Count+1)%100;
|
|
|
+ aut=autNo+Count;
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ }
|
|
|
+ record.setAutNo(aut);
|
|
|
+ }
|
|
|
res.setData(permissionService.updateById(record));
|
|
|
return res;
|
|
|
}
|