diff --git a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
index 3f83f7e..68154d0 100644
--- a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
+++ b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
@@ -86,6 +86,10 @@ public class EmployeeController extends BaseController {
     @ResponseBody
     public Map<String,Object> addUser(EmployeeDO employee){
         try {
+            //标识是否同步发邮件和短信
+            if (null != employee.getCheckbox() && employee.getCheckbox().length >0){
+                employee.setToInvite(true);
+            }
             String code = employeeService.addUser(employee);
             return data(code);
         }catch (Exception e){
diff --git a/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java b/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java
index 7ec06f0..15db79a 100644
--- a/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java
+++ b/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java
@@ -47,7 +47,7 @@ public class EmployeeDO {
     /**
      * 性别。1表示男性，2表示女性
      */
-    private int gender;
+    private Integer gender;
     /**
      * 邮箱。长度6~64个字节，且为有效的email格式。企业内必须唯一，mobile/email二者不能同时为空
      */
@@ -90,4 +90,5 @@ public class EmployeeDO {
      * 是否邀请该成员使用企业微信（将通过微信服务通知或短信或邮件下发邀请，每天自动下发一次，最多持续3个工作日），默认值为true。
      */
     private Boolean toInvite;
+    private String[] checkbox;
 }
diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
index d6c5c95..6ff89be 100644
--- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
+++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
@@ -110,8 +110,9 @@ public class EmployeeService {
             }
             //绑定部门关系
             Long[] departIds = employee.getDepartIds();
-           /* Integer[] orders = employee.getOrders();
-            Integer[] isLeaderInDept = employee.getIsLeaderInDept();*/
+/*
+            Integer[] orders = employee.getOrders();
+*/
             for (int i = 0; i < departIds.length; i++) {
                 PrivilageCpUserDepartmentDO relation = new PrivilageCpUserDepartmentDO(privilageCpUserDO.getId(), departIds[i], null, null);
                 privilageCpUserDepartmentDOMapper.insert(relation);
diff --git a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java
index 779acd6..c898c53 100644
--- a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java
+++ b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java
@@ -38,10 +38,10 @@ public class StoreEmployeeController extends BaseController {
      */
     @RequestMapping(value = "list",method = RequestMethod.POST)
     @ResponseBody
-    public Map<String,Object> listStoreUser(@RequestParam("userId")Long userId,@RequestParam("storeId")Long storeId, @RequestParam("regionId")Long regionId,
-                                            @RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize){
+    public Map<String,Object> listStoreUser(@RequestParam("userId")Long userId,Long storeId,Long regionId,Long companyId,
+                                            @RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize ,String code){
         try {
-            PageInfo<StoreUserDTO> storeUserDTOS =  storeEmployeeService.listStoreUser(userId,storeId,regionId,pageNum, pageSize);
+            PageInfo<StoreUserDTO> storeUserDTOS =  storeEmployeeService.listStoreUser(userId,storeId,regionId,companyId,pageNum, pageSize,code);
             return data(storeUserDTOS);
         }catch (Exception e){
             log.error("查询门店号列表失败",e);
diff --git a/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java b/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java
index 897b6f2..5f36a6b 100644
--- a/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java
+++ b/src/main/java/com/kiisoo/ic/store/controller/StoreStaffController.java
@@ -127,5 +127,18 @@ public class StoreStaffController extends BaseController {
         }
     }
 
-
+    /**
+     * 删除店铺人员
+     */
+    @RequestMapping(value = "/delete",method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteStaff(long staffId) {
+        try {
+            boolean del = poiStoreStaffService.deleteStaff(staffId);
+            return data(del);
+        } catch (Exception e) {
+            log.error("删除店铺人员", e);
+            return fail();
+        }
+    }
 }
diff --git a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java
index 82dd445..3366c6e 100644
--- a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java
@@ -40,4 +40,5 @@ public interface PoiStoreDOMapper extends BaseMapper<PoiStore> {
     List<PrivilageUserDO> selectSellerByShop(long shopId);
 
     String selectStoreQrCode(@Param("shopId")Long shopId);
+    List<PoiStore> selectShopByNameOrCode (@Param("name") String name);
 }
diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
index 7814556..f393802 100644
--- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
@@ -22,6 +22,7 @@ import com.kiisoo.ic.system.entity.PrivilageAccountDO;
 import com.kiisoo.ic.system.entity.PrivilageRoleDO;
 import com.kiisoo.ic.system.entity.PrivilageUserDO;
 import com.kiisoo.ic.system.enums.AccountEnum;
+import com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper;
 import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper;
 import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper;
 import com.kiisoo.ic.system.service.PrivilageAccountService;
@@ -75,6 +76,8 @@ public class PoiStoreStaffService {
     private PrivilageRoleDOMapper privilageRoleDOMapper;
     @Autowired
     private OpSellerCustomerRelationDOMapper opSellerCustomerRelationDOMapper;
+    @Autowired
+    private PrivilageAccountDOMapper privilageAccountDOMapper;
     /**
      * 根据条件查询导购信息
      *
@@ -448,4 +451,29 @@ public class PoiStoreStaffService {
         return filePath.matches("^.+\\.(?i)(xlsx)$");
     }
 
+    /**
+     * 删除店铺人员
+     * @param staffId
+     */
+    public boolean deleteStaff(long staffId) throws Exception {
+        PoiStoreStaff poiStoreStaff = poiStoreStaffDOMapper.selectById(staffId);
+        //删除店铺人员
+        Long userId = poiStoreStaff.getUserId();
+        if (null != poiStoreStaff && null !=userId ){
+            //删除用户
+            privilageUserService.removeUser(userId);
+            //删除用户角色关系
+            privilageUserRoleService.removeUserRoleRelation(userId);
+            //删除用户店铺和域关系
+            privilageDomainService.removeUserEntity(userId);
+            //删除账号
+            privilageAccountDOMapper.deleteByUserId(userId);
+        }
+        int i =  poiStoreStaffDOMapper.deleteById(staffId);
+        if (i <= 0){
+            throw new Exception("删除店铺人员失败");
+        }
+        return i > 0;
+
+    }
 }
diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
index 74ebfd8..cf22589 100644
--- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java
@@ -17,6 +17,7 @@ import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper;
 import com.kiisoo.ic.employee.service.EmployeeService;
 import com.kiisoo.ic.generalize.entity.PrivilageOrganizational;
 import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember;
+import com.kiisoo.ic.generalize.service.RetailCompanyService;
 import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper;
 import com.kiisoo.ic.store.bean.PoiStoreStaffDTO;
 import com.kiisoo.ic.store.entity.PoiStore;
@@ -89,22 +90,37 @@ public class StoreEmployeeService {
     @Autowired
     private RetailCompanyMapper retailCompanyMapper;
 
+    @Autowired
+    private RetailCompanyService retailCompanyService;
     /**
      * 查询门店号
      * @param storeId 门店id
      * @param regionId 区域id
      */
-    public PageInfo<StoreUserDTO> listStoreUser(Long userId ,Long storeId, Long regionId, Integer pageNum, Integer pageSize) {
+    public PageInfo<StoreUserDTO> listStoreUser(Long userId ,Long storeId, Long regionId,Long companyId, Integer pageNum, Integer pageSize,String code) {
         Map<String,Object> result = new HashMap<>();
         List<PoiStore> poiStores = null;
         List<Long> shopIds = new ArrayList<>();
         if (storeId != null){
             shopIds.add(storeId);
+        }else if(StringUtils.isNotBlank(code)){
+            List<PoiStore>  store =  poiStoreDOMapper.selectShopByNameOrCode(code);
+            shopIds = store.stream().map(i -> i.getId()).collect(Collectors.toList());
+            List<Long> userAllShops = privilageDomainService.listUserDatePermission(userId);
+            shopIds.retainAll(userAllShops);
         }else if(regionId != null){
             shopIds = privilageDomainService.listUserDatePermission(userId);
             //有区域就查区域店铺
             List<PoiStore> stores = poiStoreDOMapper.selectRegionShop(regionId);
             shopIds = stores.stream().map(i -> i.getId()).collect(Collectors.toList());
+            List<Long> userAllShops = privilageDomainService.listUserDatePermission(userId);
+            shopIds.retainAll(userAllShops);
+        }else if(companyId != null){
+            //如果有公司则查公司店铺
+            List<PoiStore> shops = retailCompanyService.selectShopByCompany(companyId);
+            shopIds = shops.stream().map(p -> p.getId()).collect(Collectors.toList());
+            List<Long> userAllShops = privilageDomainService.listUserDatePermission(userId);
+            shopIds.retainAll(userAllShops);
         }else{
             //查询用户权限店铺
             shopIds = new ArrayList<>(privilageDomainService.listUserDatePermission(userId));
@@ -139,8 +155,6 @@ public class StoreEmployeeService {
                 cpUserStore.setCustomerNum((int)count);
             }
         }
-        /*PageInfo<StoreUserDTO> storeUserDTOPageInfo = ;
-        storeUserDTOPageInfo.setTotal(poiStores1.getTotal());*/
         return new PageInfo<>(cpUserStoreDO) ;
     }
 
diff --git a/src/main/java/com/kiisoo/ic/system/mapper/PrivilageAccountDOMapper.java b/src/main/java/com/kiisoo/ic/system/mapper/PrivilageAccountDOMapper.java
index 8e57ab3..a7d2328 100644
--- a/src/main/java/com/kiisoo/ic/system/mapper/PrivilageAccountDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/system/mapper/PrivilageAccountDOMapper.java
@@ -38,4 +38,6 @@ public interface PrivilageAccountDOMapper extends BaseMapper<PrivilageAccountDO>
      */
     Set<Long> selectAccountIdByShopId(@Param("shopId") Long shopId);
 
+    int deleteByUserId(@Param("userId") long userId);
+
 }
diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml
index c06d931..a2f66bd 100644
--- a/src/main/resources/mapper/PoiStoreDOMapper.xml
+++ b/src/main/resources/mapper/PoiStoreDOMapper.xml
@@ -53,4 +53,11 @@
         and t1.store_id = #{shopId}
         limit 1
     </select>
+    <select id="selectShopByNameOrCode" resultType="com.kiisoo.ic.store.entity.PoiStore">
+        select t1.id,t1.name,t1.type,t1.code from poi_store t1
+        <if test="name != null and name != ''">
+            where (t1.name LIKE CONCAT('%',#{name},'%') OR t1.code LIKE
+			CONCAT('%',#{name},'%'))
+        </if>
+    </select>
 </mapper>
diff --git a/src/main/resources/mapper/PrivilageAccountDOMapper.xml b/src/main/resources/mapper/PrivilageAccountDOMapper.xml
index f3c2475..c1cb534 100644
--- a/src/main/resources/mapper/PrivilageAccountDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageAccountDOMapper.xml
@@ -32,5 +32,8 @@
         and t2.id = t3.user_id
         and t1.store_id = #{shopId}
     </select>
+    <delete id="deleteByUserId">
+        delete from privilage_account where user_id =#{userId}
+    </delete>
 
 </mapper>