。。。。

@@ -67,7 +67,7 @@ public class CompanyController {
 
         ResultJson resultJson = new ResultJson();
         if (1==i){
-            resultJson = new ResultJson("200","修改成功");
+            resultJson = new ResultJson("200","删除成功");
         }else {
             resultJson = new ResultJson("500","insert faild");
         }
@@ -81,7 +81,7 @@ public class CompanyController {
         ResultJson resultJson = new ResultJson();
 
         if (companyService.deleteByPrimaryKey(ids)>0){
-            resultJson = new ResultJson("200","修改成功");
+            resultJson = new ResultJson("200","删除成功");
         }else {
             resultJson = new ResultJson("500","insert faild");
         }

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Department;
+import com.tianbo.warehouse.service.CompanyService;
+import com.tianbo.warehouse.service.DepartmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/department")
+public class DeparmentController {
+
+    @Autowired
+    DepartmentService departmentService;
+
+    @GetMapping("/list")
+    public PageInfo<Department> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                             int pageNum,
+                                     @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                             int pageSize){
+        return departmentService.findAll(pageNum,pageSize);
+
+    }
+
+    @LogAnnotation(moduleName = "部门管理",operate = "部门添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody Department department){
+
+        int i =departmentService.insertSelective(department);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "部门管理",operate = "部门修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid Department department){
+
+        int i =departmentService.updateByPrimaryKeySelective(department);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "部门管理",operate = "部门删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody Department department, HttpServletRequest request, HttpServletResponse response){
+
+        int i =departmentService.deleteByPrimaryKey(department.getDepartmentId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "部门管理",operate = "部门批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (departmentService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.Department;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.service.DepartmentService;
+import com.tianbo.warehouse.service.GroupCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/group")
+public class GroupCompanyController {
+
+    @Autowired
+    GroupCompanyService groupCompanyService;
+
+    @GetMapping("/list")
+    public PageInfo<Group_company> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                             int pageNum,
+                                        @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                             int pageSize){
+        return groupCompanyService.findAll(pageNum,pageSize);
+
+    }
+
+    @LogAnnotation(moduleName = "集团管理",operate = "集团添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody Group_company group_company){
+
+        int i =groupCompanyService.insertSelective(group_company);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "集团管理",operate = "集团修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid Group_company group_company){
+
+        int i =groupCompanyService.updateByPrimaryKeySelective(group_company);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "集团管理",operate = "集团删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody Group_company group_company, HttpServletRequest request, HttpServletResponse response){
+
+        int i =groupCompanyService.deleteByPrimaryKey(group_company.getGroupId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "集团管理",operate = "集团批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (groupCompanyService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

@@ -9,22 +9,28 @@ import com.tianbo.warehouse.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
 @RestController()
+@RequestMapping("/role")
 public class RoleController {
 
     @Autowired
     RoleService roleService;
 
-    @GetMapping("/role/list")
+    @GetMapping("/list")
     public PageInfo<ROLE> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                         int pageNum,
-                               @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                               @RequestParam(value = "pageSize",required = false,defaultValue = "10")
                                         int pageSize){
+
         return roleService.findAll(pageNum,pageSize);
     }
 
-    @LogAnnotation(moduleName = "角色管理",operate = "角色添加")
-    @PostMapping("/role/add")
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色添加")
+    @PostMapping("/add")
     public ResultJson add(@RequestBody ROLE role){
         int i =roleService.insertSelective(role);
         return i==1 ? new ResultJson("200","添加权限成功") :new ResultJson("500","insert faild");
@@ -35,10 +41,56 @@ public class RoleController {
      * 设置角色的权限
      * @return
      */
-    @LogAnnotation(moduleName = "角色管理",operate = "权限设置")
-    @PutMapping("/role/permSet")
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "权限设置")
+    @PutMapping("/permSet")
     public ResultJson permissionSet(@RequestBody RolePermission rolePermission){
         int i = roleService.setRolePermissoin(rolePermission);
         return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败");
     }
+
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid ROLE role){
+
+        int i =roleService.updateByPrimaryKeySelective(role);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody ROLE role, HttpServletRequest request, HttpServletResponse response){
+
+        int i =roleService.deleteByPrimaryKey(role.getRoleId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (roleService.deleteByPrimaryKey(Integer.valueOf(ids))>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
 }

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.Department;
+
+import java.util.List;
+
+public interface DepartmentMapper {
+    int deleteByPrimaryKey(String departmentId);
+
+    int insert(Department record);
+
+    int insertSelective(Department record);
+
+    Department selectByPrimaryKey(String departmentId);
+
+    int updateByPrimaryKeySelective(Department record);
+
+    int updateByPrimaryKey(Department record);
+
+    List<Department> findAll();
+}
\ No newline at end of file

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.Group_company;
+
+import java.util.List;
+
+public interface Group_companyMapper {
+    int deleteByPrimaryKey(String groupId);
+
+    int insert(Group_company record);
+
+    int insertSelective(Group_company record);
+
+    Group_company selectByPrimaryKey(String groupId);
+
+    int updateByPrimaryKeySelective(Group_company record);
+
+    int updateByPrimaryKey(Group_company record);
+
+    List<Group_company> findAll();
+}
\ No newline at end of file

 package com.tianbo.warehouse.dao;
 
-import com.tianbo.warehouse.model.PERMISSION;
 import com.tianbo.warehouse.model.ROLE;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public interface ROLEMapper {
     int deleteByPrimaryKey(Integer roleId);
@@ -17,13 +13,11 @@ public interface ROLEMapper {
 
     ROLE selectByPrimaryKey(Integer roleId);
 
-    int updateByPrimaryKeySelective(ROLE record);
-
-    int updateByPrimaryKey(ROLE record);
-
     List<ROLE> findRolesByUserId(Integer userId);
 
     List<ROLE> findAll();
 
+    int updateByPrimaryKeySelective(ROLE record);
 
+    int updateByPrimaryKey(ROLE record);
 }
\ No newline at end of file

@@ -13,6 +13,16 @@ public class Company {
 
     private String companyStatus;
 
+    private String groupName;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
     public String getCompanyId() {
         return companyId;
     }

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class Department {
+    private String departmentId;
+
+    private String departmentName;
+
+    private Date creatTime;
+
+    private String companyId;
+
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId == null ? null : departmentId.trim();
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName == null ? null : departmentName.trim();
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId == null ? null : companyId.trim();
+    }
+}
\ No newline at end of file

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class Group_company {
+    private String groupId;
+
+    private String groupName;
+
+    private Date creatTime;
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName == null ? null : groupName.trim();
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+}
\ No newline at end of file

@@ -5,6 +5,7 @@ import org.springframework.security.core.GrantedAuthority;
 import java.util.List;
 
 public class ROLE implements GrantedAuthority {
+
     private static final long serialVersionUID = 1L;
 
     private Integer roleId;
@@ -15,8 +16,20 @@ public class ROLE implements GrantedAuthority {
 
     private String description;
 
+    private String departmentId;
+
+    private String departmentName;
+
     private List<PERMISSION> permissions;
 
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
     public Integer getRoleId() {
         return roleId;
     }
@@ -49,6 +62,14 @@ public class ROLE implements GrantedAuthority {
         this.description = description == null ? null : description.trim();
     }
 
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId == null ? null : departmentId.trim();
+    }
+
     public List<PERMISSION> getPermissions() {
         return permissions;
     }

@@ -78,7 +78,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 //跨域配置
                 .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
                 //管理页面只允许管理员角色访问
-                .antMatchers("/admin/**","/role/**","/user/**").authenticated()
+                .antMatchers("/admin/**","/ROLE/**","/user/**").authenticated()
                 //任何请求,登录后可以访问
                 //其余的不需要验证
                 .anyRequest().permitAll()

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Department;
+
+public interface DepartmentService {
+
+    PageInfo<Department> findAll(int pageNum, int pageSize);
+
+    int insertSelective(Department department);
+
+    int updateByPrimaryKeySelective(Department department);
+
+    int deleteByPrimaryKey(String departmentId);
+
+}

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Group_company;
+
+public interface GroupCompanyService {
+
+    PageInfo<Group_company> findAll(int pageNum, int pageSize);
+
+    int insertSelective(Group_company group_company);
+
+    int updateByPrimaryKeySelective(Group_company group_company);
+
+    int deleteByPrimaryKey(String departmentId);
+
+}

@@ -10,4 +10,8 @@ public interface RoleService {
     int insertSelective(ROLE record);
 
     int setRolePermissoin(RolePermission record);
+
+    int updateByPrimaryKeySelective(ROLE role);
+
+    int deleteByPrimaryKey(Integer departmentId);
 }

@@ -4,11 +4,14 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tianbo.warehouse.dao.CompanyMapper;
+import com.tianbo.warehouse.dao.Group_companyMapper;
 import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Group_company;
 import com.tianbo.warehouse.service.CompanyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -19,10 +22,22 @@ public class CompanyServiceImp implements CompanyService {
     @Autowired
     CompanyMapper companyMapper;
 
+    @Autowired
+    Group_companyMapper group_companyMapper;
+
     @Override
     public PageInfo<Company> findAll(int pageNum, int pageSize) {
         Page<Company> page =  PageHelper.startPage(pageNum,pageSize);
         List<Company> list = companyMapper.findAll();
+
+        for (Company company: list){
+            Group_company group_company = group_companyMapper.selectByPrimaryKey(company.getGroupId());
+            if (group_company == null){
+                group_company.setGroupName("无");
+            }else {
+                company.setGroupName(group_company.getGroupName());
+            }
+        }
         PageInfo<Company> result = new PageInfo<>(list);
         return result;
     }

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.CompanyMapper;
+import com.tianbo.warehouse.dao.DepartmentMapper;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Department;
+import com.tianbo.warehouse.service.DepartmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class DepartmentServiceImp implements DepartmentService {
+
+    @Autowired
+    DepartmentMapper departmentMapper;
+
+    @Autowired
+    CompanyMapper companyMapper;
+
+    @Override
+    public PageInfo<Department> findAll(int pageNum, int pageSize) {
+        Page<Department> page =  PageHelper.startPage(pageNum,pageSize);
+        List<Department> list = departmentMapper.findAll();
+
+        for (Department department: list){
+            Company company = companyMapper.selectByPrimaryKey(department.getCompanyId());
+            if (company == null){
+                department.setCompanyName("无");
+            }else {
+                department.setCompanyName(company.getCompanyName());
+            }
+        }
+        PageInfo<Department> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(Department department) {
+        department.setDepartmentId(UUID.randomUUID().toString());
+        department.setCreatTime(new Date());
+        return departmentMapper.insertSelective(department);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Department department) {
+        department.setCreatTime(new Date());
+        return departmentMapper.updateByPrimaryKeySelective(department);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String departmentId) {
+        if (departmentId.contains(",")){
+            try {
+                System.out.println();
+                String[] split = departmentId.split(",");
+                for (int i=0; i<split.length; i++){
+                    departmentMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return departmentMapper.deleteByPrimaryKey(departmentId);
+        }
+    }
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.DepartmentMapper;
+import com.tianbo.warehouse.dao.Group_companyMapper;
+import com.tianbo.warehouse.model.Department;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.service.DepartmentService;
+import com.tianbo.warehouse.service.GroupCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class GroupCompanyServiceImp implements GroupCompanyService {
+
+    @Autowired
+    Group_companyMapper group_companyMapper;
+
+    @Override
+    public PageInfo<Group_company> findAll(int pageNum, int pageSize) {
+        Page<Group_company> page =  PageHelper.startPage(pageNum,pageSize);
+        List<Group_company> list = group_companyMapper.findAll();
+        PageInfo<Group_company> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(Group_company group_company) {
+        group_company.setGroupId(UUID.randomUUID().toString());
+        group_company.setCreatTime(new Date());
+        return group_companyMapper.insertSelective(group_company);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Group_company group_company) {
+        group_company.setCreatTime(new Date());
+        return group_companyMapper.updateByPrimaryKeySelective(group_company);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String groupId) {
+        if (groupId.contains(",")){
+            try {
+                System.out.println("");
+                String[] split = groupId.split(",");
+                for (int i=0; i<split.length; i++){
+                    group_companyMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return group_companyMapper.deleteByPrimaryKey(groupId);
+        }
+    }
+}

@@ -3,15 +3,20 @@ package com.tianbo.warehouse.service.imp;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.DepartmentMapper;
 import com.tianbo.warehouse.dao.ROLEMapper;
 import com.tianbo.warehouse.dao.RolePermissionMapper;
+import com.tianbo.warehouse.model.Department;
 import com.tianbo.warehouse.model.ROLE;
 import com.tianbo.warehouse.model.RolePermission;
+import com.tianbo.warehouse.service.DepartmentService;
 import com.tianbo.warehouse.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service(value = "roleService")
@@ -23,11 +28,24 @@ public class RoleServiceImp implements RoleService{
     @Autowired
     private RolePermissionMapper rolePermissionMapper;
 
+    @Autowired
+    DepartmentMapper departmentMapper;
+
     @Override
     public PageInfo<ROLE> findAll(int pageNum, int pageSize){
         Page<ROLE> page =  PageHelper.startPage(pageNum,pageSize);
         List<ROLE> list = roleMapper.findAll();
+
+        for (ROLE role: list){
+            Department department = departmentMapper.selectByPrimaryKey(role.getDepartmentId());
+            if (department == null){
+                role.setDepartmentName("无");
+            }else {
+                role.setDepartmentName(department.getDepartmentName());
+            }
+        }
         PageInfo<ROLE> result = new PageInfo<ROLE>(list);
+
         return result;
     }
 
@@ -53,4 +71,29 @@ public class RoleServiceImp implements RoleService{
             return 0;
         }
     }
+
+    @Override
+    public int updateByPrimaryKeySelective(ROLE company) {
+        return roleMapper.updateByPrimaryKeySelective(company);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(Integer roleId) {
+        String s = roleId.toString();
+        if (s.contains(",")){
+            try {
+                String[] split = s.split(",");
+                for (int i=0; i<split.length; i++){
+                    roleMapper.deleteByPrimaryKey(Integer.valueOf(split[i]));
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return roleMapper.deleteByPrimaryKey(Integer.valueOf(roleId));
+        }
+    }
+
 }

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.DepartmentMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.Department" >
+    <id column="department_id" property="departmentId" jdbcType="VARCHAR" />
+    <result column="department_name" property="departmentName" jdbcType="VARCHAR" />
+    <result column="creat_time" property="creatTime" jdbcType="DATE" />
+    <result column="company_id" property="companyId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    department_id, department_name, creat_time, company_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from department
+    where department_id = #{departmentId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from department ORDER BY department_id
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from department
+    where department_id = #{departmentId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.Department" >
+    insert into department (department_id, department_name, creat_time, 
+      company_id)
+    values (#{departmentId,jdbcType=VARCHAR}, #{departmentName,jdbcType=VARCHAR}, #{creatTime,jdbcType=DATE}, 
+      #{companyId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.Department" >
+    insert into department
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="departmentId != null" >
+        department_id,
+      </if>
+      <if test="departmentName != null" >
+        department_name,
+      </if>
+      <if test="creatTime != null" >
+        creat_time,
+      </if>
+      <if test="companyId != null" >
+        company_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="departmentId != null" >
+        #{departmentId,jdbcType=VARCHAR},
+      </if>
+      <if test="departmentName != null" >
+        #{departmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        #{creatTime,jdbcType=DATE},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.Department" >
+    update department
+    <set >
+      <if test="departmentName != null" >
+        department_name = #{departmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        creat_time = #{creatTime,jdbcType=DATE},
+      </if>
+      <if test="companyId != null" >
+        company_id = #{companyId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where department_id = #{departmentId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.Department" >
+    update department
+    set department_name = #{departmentName,jdbcType=VARCHAR},
+      creat_time = #{creatTime,jdbcType=DATE},
+      company_id = #{companyId,jdbcType=VARCHAR}
+    where department_id = #{departmentId,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.Group_companyMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.Group_company" >
+    <id column="group_id" property="groupId" jdbcType="VARCHAR" />
+    <result column="group_name" property="groupName" jdbcType="VARCHAR" />
+    <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    group_id, group_name, creat_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from group_company
+    where group_id = #{groupId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from group_company ORDER BY group_id
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from group_company
+    where group_id = #{groupId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.Group_company" >
+    insert into group_company (group_id, group_name, creat_time
+      )
+    values (#{groupId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR}, #{creatTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.Group_company" >
+    insert into group_company
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="groupId != null" >
+        group_id,
+      </if>
+      <if test="groupName != null" >
+        group_name,
+      </if>
+      <if test="creatTime != null" >
+        creat_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="groupId != null" >
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupName != null" >
+        #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.Group_company" >
+    update group_company
+    <set >
+      <if test="groupName != null" >
+        group_name = #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        creat_time = #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where group_id = #{groupId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.Group_company" >
+    update group_company
+    set group_name = #{groupName,jdbcType=VARCHAR},
+      creat_time = #{creatTime,jdbcType=TIMESTAMP}
+    where group_id = #{groupId,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tianbo.warehouse.dao.ROLEMapper">
-  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.ROLE">
-    <id column="role_id" jdbcType="INTEGER" property="roleId" />
-    <result column="role_name" jdbcType="VARCHAR" property="roleName" />
-    <result column="role_sign" jdbcType="VARCHAR" property="roleSign" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <collection property="permissions" ofType="PERMISSION" javaType="java.util.ArrayList" select="com.tianbo.warehouse.dao.PERMISSIONMapper.getRolePermisson" column="role_id"></collection>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.ROLEMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.ROLE" >
+    <id column="role_id" property="roleId" jdbcType="INTEGER" />
+    <result column="role_name" property="roleName" jdbcType="VARCHAR" />
+    <result column="role_sign" property="roleSign" jdbcType="VARCHAR" />
+    <result column="description" property="description" jdbcType="VARCHAR" />
+    <result column="department_id" property="departmentId" jdbcType="VARCHAR" />
   </resultMap>
-  <sql id="Base_Column_List">
-    role_id, role_name, role_sign, description
+  <sql id="Base_Column_List" >
+    role_id, role_name, role_sign, description, department_id
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from role
     where role_id = #{roleId,jdbcType=INTEGER}
   </select>
+
   <select id="findAll" resultMap="BaseResultMap" >
     SELECT
     <include refid="Base_Column_List" />
@@ -31,68 +32,78 @@
     LEFT JOIN role R ON  R.role_id= UR.role_id
     where U.user_id = #{userId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from role
     where role_id = #{roleId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.tianbo.warehouse.model.ROLE">
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.ROLE" >
     insert into role (role_id, role_name, role_sign, 
-      description)
+      description, department_id)
     values (#{roleId,jdbcType=INTEGER}, #{roleName,jdbcType=VARCHAR}, #{roleSign,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR})
+      #{description,jdbcType=VARCHAR}, #{departmentId,jdbcType=VARCHAR})
   </insert>
-
-  <insert id="insertSelective" parameterType="Integer">
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.ROLE" >
     insert into role
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="roleId != null" >
         role_id,
       </if>
-      <if test="roleName != null">
+      <if test="roleName != null" >
         role_name,
       </if>
-      <if test="roleSign != null">
+      <if test="roleSign != null" >
         role_sign,
       </if>
-      <if test="description != null">
+      <if test="description != null" >
         description,
       </if>
+      <if test="departmentId != null" >
+        department_id,
+      </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="roleId != null" >
         #{roleId,jdbcType=INTEGER},
       </if>
-      <if test="roleName != null">
+      <if test="roleName != null" >
         #{roleName,jdbcType=VARCHAR},
       </if>
-      <if test="roleSign != null">
+      <if test="roleSign != null" >
         #{roleSign,jdbcType=VARCHAR},
       </if>
-      <if test="description != null">
+      <if test="description != null" >
         #{description,jdbcType=VARCHAR},
       </if>
+      <if test="departmentId != null" >
+        #{departmentId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.ROLE">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.ROLE" >
     update role
-    <set>
-      <if test="roleName != null">
+    <set >
+      <if test="roleName != null" >
         role_name = #{roleName,jdbcType=VARCHAR},
       </if>
-      <if test="roleSign != null">
+      <if test="roleSign != null" >
         role_sign = #{roleSign,jdbcType=VARCHAR},
       </if>
-      <if test="description != null">
+      <if test="description != null" >
         description = #{description,jdbcType=VARCHAR},
       </if>
+      <if test="departmentId != null" >
+        department_id = #{departmentId,jdbcType=VARCHAR},
+      </if>
     </set>
     where role_id = #{roleId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.ROLE">
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.ROLE" >
     update role
     set role_name = #{roleName,jdbcType=VARCHAR},
       role_sign = #{roleSign,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR}
+      description = #{description,jdbcType=VARCHAR},
+      department_id = #{departmentId,jdbcType=VARCHAR}
     where role_id = #{roleId,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file