diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
index 0d11dc3a..6567cd3f 100644
Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/CoeCooperationAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/CoeCooperationAPIManager.java
index 57e8cec4..d2f23751 100644
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/CoeCooperationAPIManager.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/CoeCooperationAPIManager.java
@@ -613,6 +613,9 @@ public class CoeCooperationAPIManager {
     public void removeCooperationHideRole(String teamId, String roleName) {
         CoeCooperationRoleDao roleDao = new CoeCooperationRoleDao();
         CoeCooperationRoleModel deletedRole = roleDao.getCooperationHideRoleByRoleName(teamId, roleName);
+        if (deletedRole == null){
+            return;
+        }
         removeCooperationRolePerms(teamId, deletedRole.getId());
         roleDao.remove(teamId, deletedRole.getId());
     }
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/dao/CoeCooperationRoleDao.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/dao/CoeCooperationRoleDao.java
index 54c23b80..3e1a8d9f 100644
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/dao/CoeCooperationRoleDao.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/cooperation/dao/CoeCooperationRoleDao.java
@@ -183,7 +183,7 @@ public class CoeCooperationRoleDao extends DaoObject<CoeCooperationRoleModel> {
      * @return
      */
     public List<CoeCooperationRoleModel> getCooperationRoleByTeam(String teamId) {
-        String sql = "SELECT * FROM " + entityName() + " WHERE " + CoeCooperationRoleModel.TEAMID + " =?";
+        String sql = "SELECT * FROM " + entityName() + " WHERE " + CoeCooperationRoleModel.TEAMID + " =? and "+CoeCooperationRoleModel.ISUSER +"=0";
         return DBSql.query(sql, rowMapper(), new Object[]{teamId});
     }