Merge branch 'master_xgh_pendingid' into 'developer'

Master xgh pendingid

See merge request !314

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffDepartmentRelatedServiceImpl.java

@@ -118,7 +118,7 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	
 	@Override
 	public void repairAllStaffDepart(String params) {
-	    logger.info("修复成员部门={}",params);
+	    logger.info("修复无部门成员={}",params);
 	    int addDay = 0 ;
 	    String wxEnterpriseId = null ;
 	    if(params.contains("#")) {
@@ -131,7 +131,7 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	    List<String> list = this.mapper.listNoDepartStaff(wxEnterpriseId, addDate) ;
 	    if(CollectionUtils.isNotEmpty(list)) {
 	        logger.info("修复成员部门,成员数={}",list.size());
-	        DingUtils.send("修复成员部门信息,数量="+list.size(), false);
+	        DingUtils.send("修复无部门成员消息,数量="+list.size(), false);
 	        for(String staffId : list) {
 	            this.repairStaffDepart(staffId);
 	        }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseRelatedServiceImpl.java

@@ -117,7 +117,7 @@ public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedServic
                 settFlag = false ;
             }
         }
-        if(openCardFlag == 0 && wxEnterpriseType ==0 && settFlag)  {
+        if(openCardFlag == 0 && wxEnterpriseType ==0 && !settFlag)  {
             return true ;
         }
         return true ;