Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -193,6 +193,10 @@ public class MessageApiServiceImpl implements MessageApiService {
             staff.setStaffName(qywxCallBackDTO.getUserName());
             staff.setWxUserId(qywxCallBackDTO.getUserid());
             staff.setPostion(qywxCallBackDTO.getPosition());
+            //激活状态
+            if(qywxCallBackDTO.getStatus() != null && qywxCallBackDTO.getStatus() == 1){
+            	staff.setActiveFlag(1);
+            }
             Integer status = qywxCallBackDTO.getStatus();
             if(status != null && status == 1){
             	staff.setActiveFlag(1);

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

@@ -268,6 +268,11 @@ public class StaffApiServiceImpl implements StaffApiService {
 					tab.setActiveFlag(1);
 					tab.setPostion(user.getPosition());
 					tab.setExtendPostion(user.getExternal_position());
+					if(user.getStatus() != null && user.getStatus() == 1){
+						tab.setActiveFlag(1);
+		            } else {
+		            	tab.setActiveFlag(0);
+		            }
 					String staffId = staffService.add(tab);
 					
 					Integer[] departmentId = user.getDepartment();