代码修改

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/Department.java

@@ -29,7 +29,6 @@ public class Department {
     @NotNull(message = "部门名称不可为空")
     String name;
     @ApiModelProperty(value = "部门等级",example = "1")
-    @NotNull(message = "部门等级不可为空")
     String level;
 
     @ApiModelProperty(value = "部门描述",example = "1")

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/vo/PageResponse.java

@@ -38,13 +38,6 @@ public class PageResponse<T> implements Serializable {
      */
     private List<T> rows;
 
-    public void setTotalCount(int totalCount) {
-        //设置了totalCount就可以计算出总totalPage
-        this.totalCount = totalCount;
-        int countRecords = this.getTotalCount();
-        int totalPages = countRecords % pageSize == 0 ? countRecords / pageSize : (countRecords / pageSize + 1);
-        setTotalPage(totalPages);
-    }
 
     /**
      * 设置结果 及总页数

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/DepartmentServiceImpl.java

@@ -38,6 +38,9 @@ public class DepartmentServiceImpl implements IDepartmentService {
 
     @Override
     public Department addDepartments(Department department) {
+        if(department.getLevel()!=null&&department.getLevel().equals("1")){
+            return departmentDao.save(department);
+        }
         Optional<Department> optional = departmentDao.findById(department.getParentId());
         if(optional.isPresent()){
             Department department1 = optional.get();

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/RoleServiceImpl.java

@@ -98,6 +98,7 @@ public class RoleServiceImpl implements IRoleService {
         try {
             userRoleDao.deleteAllByRoleId(id);
             roleAuthorityDao.deleteAllByRoleId(id);
+            roleDao.deleteById(id);
             return true;
         } catch (Exception e) {
             logger.error("mongodb删除角色时出错");