。。。。。

@@ -23,8 +23,9 @@ public class CompanyController {
     public PageInfo<Company> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                              int pageNum,
                                   @RequestParam(value = "pageSize",required = false,defaultValue = "5")
-                                             int pageSize){
-        return companyService.findAll(pageNum,pageSize);
+                                             int pageSize,
+                                  @RequestParam(value = "companyName", required = false) String companyName){
+        return companyService.findAll(pageNum,pageSize, companyName);
 
     }
 

@@ -25,8 +25,9 @@ public class DeparmentController {
     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);
+                                             int pageSize,
+                                     @RequestParam(value = "departmentName", required = false) String departmentName){
+        return departmentService.findAll(pageNum,pageSize, departmentName);
 
     }
 

@@ -25,8 +25,9 @@ public class GroupCompanyController {
     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);
+                                             int pageSize,
+                                        @RequestParam(value = "groupName") String groupName){
+        return groupCompanyService.findAll(pageNum,pageSize, groupName);
 
     }
 

@@ -24,9 +24,11 @@ public class RoleController {
     public PageInfo<ROLE> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                         int pageNum,
                                @RequestParam(value = "pageSize",required = false,defaultValue = "10")
-                                        int pageSize){
+                                        int pageSize,
+                               @RequestParam(value = "roleName",required = false)
+                                           String roleName){
 
-        return roleService.findAll(pageNum,pageSize);
+        return roleService.findAll(pageNum,pageSize, roleName);
     }
 
     @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色添加")

@@ -39,13 +39,11 @@ public class UserController {
                                         int pageNum,
                                 @RequestParam(value = "pageSize",required = false,defaultValue = "5")
                                         int pageSize,
-                                @RequestParam(value = "username",required = false) String username,
-                                @RequestParam(value = "realname",required = false) String realname)
+                                @RequestParam(value = "userName",required = false) String username,
+                                @RequestParam(value = "realName",required = false) String realname)
     {
-        USERS user = new USERS();
-        user.setUsername(username);
-        user.setRealname(realname);
-        PageInfo<USERS> usersPageInfo = userService.selectAllUser(pageNum,pageSize,user);
+
+        PageInfo<USERS> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username,  realname);
         return new ResultJson("200","success",usersPageInfo);
     }
 

 package com.tianbo.warehouse.dao;
 
 import com.tianbo.warehouse.model.Company;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,5 +18,5 @@ public interface CompanyMapper {
 
     int updateByPrimaryKey(Company record);
 
-    List<Company> findAll();
+    List<Company> findAll(@Param("companyName") String companyName);
 }
\ No newline at end of file

 package com.tianbo.warehouse.dao;
 
 import com.tianbo.warehouse.model.Department;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,5 +18,7 @@ public interface DepartmentMapper {
 
     int updateByPrimaryKey(Department record);
 
-    List<Department> findAll();
+    List<Department> findAll(@Param("departmentName") String departmentName);
+
+    int count(String departmentId);
 }
\ No newline at end of file

 package com.tianbo.warehouse.dao;
 
 import com.tianbo.warehouse.model.Group_company;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,5 +18,5 @@ public interface Group_companyMapper {
 
     int updateByPrimaryKey(Group_company record);
 
-    List<Group_company> findAll();
+    List<Group_company> findAll(@Param("groupName") String groupName);
 }
\ No newline at end of file

 package com.tianbo.warehouse.dao;
 
 import com.tianbo.warehouse.model.ROLE;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,7 +16,7 @@ public interface ROLEMapper {
 
     List<ROLE> findRolesByUserId(Integer userId);
 
-    List<ROLE> findAll();
+    List<ROLE> findAll(@Param("roleName") String roleName);
 
     int updateByPrimaryKeySelective(ROLE record);
 

 package com.tianbo.warehouse.dao;
 
 import com.tianbo.warehouse.model.USERS;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,5 +20,5 @@ public interface USERSMapper {
 
     List<USERS> selectByUsername(String userName);
 
-    List<USERS> selectAllUser(USERS record);
+    List<USERS> selectAllUser(USERS users);
 }
\ No newline at end of file

@@ -5,7 +5,7 @@ import com.tianbo.warehouse.model.Company;
 
 public interface CompanyService {
 
-    PageInfo<Company> findAll(int pageNum, int pageSize);
+    PageInfo<Company> findAll(int pageNum, int pageSize, String company);
 
     int insertSelective(Company company);
 

@@ -5,7 +5,7 @@ import com.tianbo.warehouse.model.Department;
 
 public interface DepartmentService {
 
-    PageInfo<Department> findAll(int pageNum, int pageSize);
+    PageInfo<Department> findAll(int pageNum, int pageSize, String departmentName);
 
     int insertSelective(Department department);
 

@@ -5,7 +5,7 @@ import com.tianbo.warehouse.model.Group_company;
 
 public interface GroupCompanyService {
 
-    PageInfo<Group_company> findAll(int pageNum, int pageSize);
+    PageInfo<Group_company> findAll(int pageNum, int pageSize, String groupName);
 
     int insertSelective(Group_company group_company);
 

@@ -5,7 +5,7 @@ import com.tianbo.warehouse.model.ROLE;
 import com.tianbo.warehouse.model.RolePermission;
 
 public interface RoleService {
-    PageInfo<ROLE> findAll(int pageNum, int pageSize);
+    PageInfo<ROLE> findAll(int pageNum, int pageSize, String roleName);
 
     int insertSelective(ROLE record);
 

@@ -9,7 +9,7 @@ import java.util.List;
 public interface UserService {
     USERS loadByUsername(String username);
 
-    PageInfo<USERS> selectAllUser(int pageNum, int pageSize,USERS users);
+    PageInfo<USERS> selectAllUser(int pageNum, int pageSize,String username, String realName);
 
     int updateByPrimaryKeySelective(USERS record);
 

@@ -26,9 +26,9 @@ public class CompanyServiceImp implements CompanyService {
     Group_companyMapper group_companyMapper;
 
     @Override
-    public PageInfo<Company> findAll(int pageNum, int pageSize) {
+    public PageInfo<Company> findAll(int pageNum, int pageSize, String companyName) {
         Page<Company> page =  PageHelper.startPage(pageNum,pageSize);
-        List<Company> list = companyMapper.findAll();
+        List<Company> list = companyMapper.findAll(companyName);
 
         for (Company company: list){
             Group_company group_company = group_companyMapper.selectByPrimaryKey(company.getGroupId());
@@ -69,6 +69,7 @@ public class CompanyServiceImp implements CompanyService {
                 return 0;
             }
         }else {
+
             return companyMapper.deleteByPrimaryKey(companyId);
         }
     }

@@ -26,9 +26,9 @@ public class DepartmentServiceImp implements DepartmentService {
     CompanyMapper companyMapper;
 
     @Override
-    public PageInfo<Department> findAll(int pageNum, int pageSize) {
+    public PageInfo<Department> findAll(int pageNum, int pageSize, String departmentName) {
         Page<Department> page =  PageHelper.startPage(pageNum,pageSize);
-        List<Department> list = departmentMapper.findAll();
+        List<Department> list = departmentMapper.findAll(departmentName);
 
         for (Department department: list){
             Company company = companyMapper.selectByPrimaryKey(department.getCompanyId());

@@ -23,9 +23,9 @@ public class GroupCompanyServiceImp implements GroupCompanyService {
     Group_companyMapper group_companyMapper;
 
     @Override
-    public PageInfo<Group_company> findAll(int pageNum, int pageSize) {
+    public PageInfo<Group_company> findAll(int pageNum, int pageSize, String groupName) {
         Page<Group_company> page =  PageHelper.startPage(pageNum,pageSize);
-        List<Group_company> list = group_companyMapper.findAll();
+        List<Group_company> list = group_companyMapper.findAll(groupName);
         PageInfo<Group_company> result = new PageInfo<>(list);
         return result;
     }

@@ -32,9 +32,9 @@ public class RoleServiceImp implements RoleService{
     DepartmentMapper departmentMapper;
 
     @Override
-    public PageInfo<ROLE> findAll(int pageNum, int pageSize){
+    public PageInfo<ROLE> findAll(int pageNum, int pageSize, String roleName){
         Page<ROLE> page =  PageHelper.startPage(pageNum,pageSize);
-        List<ROLE> list = roleMapper.findAll();
+        List<ROLE> list = roleMapper.findAll(roleName);
 
         for (ROLE role: list){
             Department department = departmentMapper.selectByPrimaryKey(role.getDepartmentId());

@@ -56,8 +56,11 @@ public class UserServiceImpl implements UserService{
     }
 
     @Override
-    public PageInfo<USERS> selectAllUser(int pageNum, int pageSize,USERS users){
+    public PageInfo<USERS> selectAllUser(int pageNum, int pageSize,String username, String realName){
         Page<USERS> page =  PageHelper.startPage(pageNum,pageSize);
+        USERS users = new USERS();
+        users.setUsername(username);
+        users.setRealname(realName);
         List<USERS> list = usersMapper.selectAllUser(users);
         for (USERS user: list) {
             List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());

@@ -18,10 +18,14 @@
     where company_id = #{companyId,jdbcType=VARCHAR}
   </select>
 
-  <select id="findAll" resultMap="BaseResultMap" >
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select
     <include refid="Base_Column_List" />
-    from company ORDER BY company_id
+    from company
+    <if test="companyName != ''">
+      where company_name = #{companyName,jdbcType=VARCHAR}
+    </if>
+    ORDER BY company_id
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >

@@ -17,10 +17,18 @@
     where department_id = #{departmentId,jdbcType=VARCHAR}
   </select>
 
-  <select id="findAll" resultMap="BaseResultMap" >
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select
     <include refid="Base_Column_List" />
-    from department ORDER BY department_id
+    from department
+    <if test="departmentName != ''" >
+      where department_name = #{departmentName, jdbcType=VARCHAR}
+    </if>
+    ORDER BY department_id
+  </select>
+
+  <select id="count" parameterType="string" resultType="int">
+    select count(*) from department where department_id = #{value}
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >

@@ -16,10 +16,14 @@
     where group_id = #{groupId,jdbcType=VARCHAR}
   </select>
 
-  <select id="findAll" resultMap="BaseResultMap" >
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select
     <include refid="Base_Column_List" />
-    from group_company ORDER BY group_id
+    from group_company
+    <if test="groupName != ''" >
+      where group_name = #{groupName, jdbcType=VARCHAR}
+    </if>
+    ORDER BY group_id
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >

@@ -18,10 +18,13 @@
     where role_id = #{roleId,jdbcType=INTEGER}
   </select>
 
-  <select id="findAll" resultMap="BaseResultMap" >
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String">
     SELECT
     <include refid="Base_Column_List" />
     FROM role
+    <if test="roleName != ''" >
+      where role_name = #{roleName, jdbcType=VARCHAR}
+    </if>
   </select>
   <select id="findRolesByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     SELECT

@@ -49,12 +49,12 @@
     from users
     where username = #{username,jdbcType=VARCHAR}
   </select>
-  <select id="selectAllUser" resultMap="SecurityResult" parameterType="com.tianbo.warehouse.model.USERS" >
+  <select id="selectAllUser" resultMap="BaseResultMap" parameterType="com.tianbo.warehouse.model.USERS" >
     select
-    <include refid="user_List" />
+    *
     from users
     WHERE  1=1
-    <if test="username != null" >
+    <if test=" username != null" >
      and  username = #{username,jdbcType=VARCHAR}
     </if>
     <if test="realname != null" >