员工管理优化

src/main/java/com/chinaitop/depot/basic/mapper/BasicKeeperMapper.java

@@ -39,10 +39,18 @@ public interface BasicKeeperMapper {
     List<BasicKeeper> selectBarn(Map<String,Object> map);
     /**
      * 根据名字和仓房id
-     *@param storehouseId
+     * @param storehouseId
      * @param name
      * @return
      */
     List<BasicKeeper> getKeeperListByNameAndHouseId(@Param("name") String name,@Param("storehouseId")Integer storehouseId);
 
+    /**
+     * 获取当前员工的角色名称
+     * 
+     * @param param_map
+     * @return
+     */
+    String getRoleName(@Param(value="roleId") Integer roleId);
+
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicKeeperMapper.xml

@@ -654,4 +654,8 @@
               and bk.del_flag = 1
             </where>
   </select>
+  <!-- 查询当前员工的角色名称 -->
+  <select id="getRoleName" parameterType="java.lang.Integer" resultType="java.lang.String">
+  	SELECT role_name FROM role_info WHERE role_id=${roleId}
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/basic/service/impl/BasicKeeperServiceImpl.java

@@ -273,7 +273,8 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 			
 			//如果由保管员改变到其它部门后，要把他管理的仓房删掉
 			int roleId = basicKeeper.getPostType();
-			if (roleId != 14) {
+			String roleName = mapper.getRoleName(roleId);
+			if (!"保管员".equals(roleName) && !"仓储人员".equals(roleName)) {
 				BasicKeeperHouseExample khExample = new BasicKeeperHouseExample();
 				BasicKeeperHouseExample.Criteria khCriteria = khExample.createCriteria();
 				khCriteria.andKeeperIdEqualTo(id);