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/StaffApiServiceImpl.java

@@ -603,16 +603,16 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    }
 	    TabHaobanDepartment department = departmentService.selectByRelatedId(gicStoreId);
 	    if(department == null){
-	    	try {
-				Thread.sleep(3 * 1000);
-				department = departmentService.selectByRelatedId(gicStoreId);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-	    	if(department == null){
+//	    	try {
+//				Thread.sleep(3 * 1000);
+//				department = departmentService.selectByRelatedId(gicStoreId);
+//			} catch (InterruptedException e) {
+//				e.printStackTrace();
+//			}
+//	    	if(department == null){
 	    		logger.info("【店员同步】department为空");
 		    	return;
-	    	}
+//	    	}
 	    }
 	    String departmentId = department.getDepartmentId();
 	    String wxEnterpriseId  = department.getWxEnterpriseId();

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/InfoController.java

@@ -39,6 +39,10 @@ public class InfoController extends WebBaseController{
 		String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(),code);
 		logger.info("userDTOJson=============>{}",userDTOJson);
 		UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
+		if(user == null) {
+			
+			return resultResponse(HaoBanErrCode.ERR_6); 
+		}
 		String userId = user.getUserid();
 		String corpId = user.getCorpid();
 		WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);