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

@@ -281,6 +281,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 		if(staff == null) {
 			WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
 			TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,1);
+			if(application == null){
+				application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,2);
+			}
 			if(enterpriseDTO != null) {
 				if(application != null) {
 					Date now = new Date();

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

@@ -77,6 +77,9 @@ public class LoginController extends WebBaseController{
 		LoginVO loginVO = new LoginVO();
 //		StaffDTO staff = staffApiService.selectById("1");
 		logger.info("【好办登录】staff={}",JSON.toJSONString(loginStaff));
+		if(loginStaff == null){
+			return;
+		}
 		loginVO.setWxEnterpriseId(loginStaff.getWxEnterpriseId());
 		loginVO.setStaffDTO(loginStaff);
 		AuthRequestUtil.setSessionUser(loginVO);

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

@@ -51,6 +51,9 @@ public class InfoController extends WebBaseController{
 				loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId,enterprise.getWxEnterpriseId());
 			}
 		}
+		if(loginStaff == null){
+			return resultResponse(HaoBanErrCode.ERR_600001);
+		}
 		
 		String wxEnterpriseId = loginStaff.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -179,6 +179,8 @@ public enum HaoBanErrCode {
     ERR_200002(200002, "非当前登录企业员工"),
 
     ERR_500001(500001, "该企业没关联好办"),
+    ERR_600001(600001, "成员不存在,请联系管理员后台授权通讯录权限"),
+    
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");
     private int code;