Merge branch 'developer' into 'master'

Developer

See merge request !24

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

@@ -668,9 +668,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    }
 	    String departmentId = department.getDepartmentId();
 	    String wxEnterpriseId  = department.getWxEnterpriseId();
-	    StaffDTO staff = this.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
-
-		if(staff == null){
+//	    StaffDTO staff = this.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
+        StaffDTO staff = geCcheckAndInitUser(wxEnterpriseId, nationcode, phoneNumber);
+        if(staff == null){
 	    	if(status != 1){
 	    		return;
 	    	}else{
@@ -766,6 +766,27 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    }
 	}
 
+    private StaffDTO geCcheckAndInitUser(String wxEnterpriseId, String nationcode, String phoneNumber) {
+        logger.info("校验获取信息：{}", phoneNumber);
+        StaffDTO staff = this.selectByNationcodeAndPhoneNumber(wxEnterpriseId, nationcode, phoneNumber);
+        if (null != staff) {
+            return staff;
+        }
+        WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+        TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 1);
+
+        if (null == enterpriseDTO || application == null) {
+            return null;
+        }
+        String userId = qywxUserApiService.getWxUserIdByPhonenumber(enterpriseDTO.getCorpid(), application.getSiteId(), phoneNumber);
+        logger.info("获取userId:{}，{}", phoneNumber, userId);
+        if (userId == null) {
+            return null;
+        }
+        wxGetAdd(userId, wxEnterpriseId);
+        return this.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
+    }
+
 	@Override
 	public StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code) {
 		return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, staffDepartmentRelatedMapper.getDepartmentIdAndCode(departmentId,code));