1.增加加入黑名单和解除黑名单权限 2.解除黑名单后归属来源显示为-

happy-job-base-system/src/main/webapp/webpage/modules/omcandidate/omBlacklistCandidateList.jsp

@@ -155,7 +155,9 @@ $(document).ready(function() {
                     }
                 },
                 formatter:  function operateFormatter(value, row, index) {
-                    return '<a href="#" class="cancelBlacklist">解除黑名单</a>';
+                	return '<div style="float:left;width:50%"><shiro:hasPermission name="om:candidate:cancelBlacklist">'+
+			        			'<a href="#" class="cancelBlacklist">解除黑名单</a>'+
+			         		'</shiro:hasPermission></div>';
                 }
               }
 		     ]

happy-job-base-system/src/main/webapp/webpage/modules/omcandidate/omCandidateBelongList.jsp

@@ -41,7 +41,7 @@
 				<tr class="${status.index%2==0?'tr_color_1':'tr_color_2'}">
 					<td width="25%">${not empty belong.belongUser?belong.belongUser:'-'}</td>
 					<td width="25%">${fns:getDictLabel(belong.type, 'om_candidate_belong_type', '-')}</td>
-					<td width="25%">${belong.type!=0?belong.assignmentBy:"-"}</td>
+					<td width="25%">${(belong.type==0 || belong.type==3)?"-":belong.assignmentBy}</td>
 					<td width="25%"><fmt:formatDate value="${belong.belongTime}" pattern="yyyy/MM/dd HH:mm"/></td>
 				</tr>
 			</c:forEach>

happy-job-base-system/src/main/webapp/webpage/modules/omcandidate/omCandidateInfoList.jsp

@@ -193,7 +193,9 @@
 						<shiro:hasPermission name="om:candidate:assign">
 							<a style="margin-left:10px" href='javascript:assign()'> 重新分配 </a>
 						</shiro:hasPermission>
-						<a style="margin-left:10px" href='javascript:blacklist()'> 黑名单 </a>
+						<shiro:hasPermission name="om:candidate:blacklist">
+							<a style="margin-left:10px" href='javascript:blacklist()'> 黑名单 </a>
+						</shiro:hasPermission>
 					</c:if>
 					<c:if test="${omCandidate.type==1}">
 						<a style="margin-left:10px"  href='javascript:cancelQuality()'> 取消优质 </a>
@@ -202,7 +204,9 @@
 						</shiro:hasPermission>
 					</c:if>
 					<c:if test="${omCandidate.type==2}">
-						<a style="margin-left:10px" href='javascript:cancelBlacklist()'> 解除黑名单 </a>
+						<shiro:hasPermission name="om:candidate:cancelBlacklist">
+							<a style="margin-left:10px" href='javascript:cancelBlacklist()'> 解除黑名单 </a>
+						</shiro:hasPermission>
 					</c:if>
 				</div>		
 			</div>

happy-job-base-system/src/main/webapp/webpage/modules/omcandidate/omCandidateList.jsp

@@ -209,7 +209,9 @@ $(document).ready(function() {
 			         		 '</shiro:hasPermission></div>';
                 	 var b = '<div style="float:left;width:50%"></div>';
                 	 if(row.type==0){
-                		 b = '<div style="float:left;width:50%"><a href="#" class="blacklist">黑名单</a></div>';
+                		 b = '<div style="float:left;width:50%"><shiro:hasPermission name="om:candidate:blacklist">'+
+			        			'<a href="#" class="blacklist">黑名单</a>'+
+			         		 '</shiro:hasPermission></div>';
                 	 }
                     return a + b;
                 }