111

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

@@ -765,14 +765,16 @@ public class ClerkController extends WebBaseController{
 		List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCodeByStaffId(enterpriseIdList, staffId);
 		//主门店
 		ClerkMainStoreRelatedDTO mainDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId);
-		String storeId = mainDTO.getStoreId();
+		String storeId = mainDTO == null?"":mainDTO.getStoreId();
 		for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
 			ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
 			if(clerk != null){
 				StoreDTO store = storeService.getStore(clerk.getStoreId());
 				//主门店标志
 				int mainStoreFlag  = 0;
-				if(storeId.equals(store.getStoreId())){
+				if(StringUtils.isEmpty(storeId)){
+					mainStoreFlag = 0;
+				}else if(storeId.equals(store.getStoreId())){
 					mainStoreFlag = 1;
 				}
 				staffDepartmentRelatedApiService.listByStaffId(staffId);